diff --git a/.gitignore b/.gitignore
index d9a8292..fe9ad27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@ HELP.md
 *.iml
 *.ipr
 
+.DS_Store
+*DS_Store
+
 ### VS Code ###
 .vscode/
 !/.mvn/
diff --git a/.gitpod.yml b/.gitpod.yml
index 68682e6..2296438 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,21 +1,22 @@
-image: humourmind/yugabytedb:2.13.1.0-b112
+image: gitpod/workspace-yugabytedb-preview
 
 tasks:
   - name: 1a-yb-ep
-    before: |
-      yugabyted start --base_dir=${GITPOD_REPO_ROOT}/ybdb/ --listen=$HOST --tserver_flags="placement_cloud=ybcloud,placement_region=ap-south-1,placement_zone=ap-south-1a" --master_flags="placement_cloud=ybcloud,placement_region=ap-south-1,placement_zone=ap-south-1a"
-      yb-admin -master_addresses $HOST:7100 modify_placement_info ybcloud.ap-south-1.ap-south-1a 1
-      gp sync-done cluster-config
+    env:
+      DATA_PATH: ybdb
+    command: |
+      mkdir -p ${GITPOD_REPO_ROOT}/${DATA_PATH}
+      yugabyted start --base_dir=${GITPOD_REPO_ROOT}/${DATA_PATH} --advertise_address=$HOST --background=true
   - name: 1aa-ysql-shell
     before: |
-      gp sync-await cluster-config && gp await-port 5433
+      gp ports await 5433 && sleep 2
       ysqlsh -h $(hostname -i) -f ./dsql/init-ysql.sql
       gp sync-done ysql-init
     command: |
       ysqlsh -h $(hostname -i)
   - name: 1ab-ycql-shell
     before: |
-      gp sync-await cluster-config && gp await-port 9042
+      gp ports await 9042
       ycqlsh $(hostname -i) -e "CREATE KEYSPACE ALERTS"
     command: |
       ycqlsh $(hostname -i)
@@ -38,7 +39,7 @@ tasks:
       ${GITPOD_REPO_ROOT}/kafka/bin/zookeeper-server-start.sh ${GITPOD_REPO_ROOT}/kafka/config/zookeeper.properties
   - name: 1bb-kafka-ep
     command: |
-      gp await-port 2181
+      gp ports await 2181
       ${GITPOD_REPO_ROOT}/kafka/bin/kafka-server-start.sh ${GITPOD_REPO_ROOT}/kafka/config/server.properties
   - name: 2aa-supplier
     before: |
@@ -46,7 +47,7 @@ tasks:
       gp sync-await import-deps-jr
       mvn package -DskipTests
     command: |
-      gp sync-await ysql-init && gp await-port 9092
+      gp sync-await ysql-init && gp ports await 9092
       export YB_STREAM_ID=$(yb-admin -master_addresses $HOST:7100 create_change_data_stream ysql.yugabyte | awk '{print $4};{$1=$1}')
       java -jar target/*.jar
   - name: 2ab-processor
@@ -55,7 +56,7 @@ tasks:
       gp sync-await import-deps-jr
       mvn package -DskipTests
     command: |
-      gp await-port 9092
+      gp ports await 9092
       java -jar target/*.jar
   - name: 2ac-consumer
     before: |
@@ -63,7 +64,7 @@ tasks:
       gp sync-await import-deps-jr
       mvn package -DskipTests
     command: |
-      gp await-port 9092
+      gp ports await 9092
       java -jar target/*.jar
 
 ports:
diff --git a/flightschedule/lib/debezium-connector-yugabytedb-1.3.5-BETA.jar b/flightschedule/lib/debezium-connector-yugabytedb-1.9.5.y.33.SNAPSHOT.jar
similarity index 65%
rename from flightschedule/lib/debezium-connector-yugabytedb-1.3.5-BETA.jar
rename to flightschedule/lib/debezium-connector-yugabytedb-1.9.5.y.33.SNAPSHOT.jar
index 0d9f600..c5e29a2 100644
Binary files a/flightschedule/lib/debezium-connector-yugabytedb-1.3.5-BETA.jar and b/flightschedule/lib/debezium-connector-yugabytedb-1.9.5.y.33.SNAPSHOT.jar differ
diff --git a/flightschedule/pom.xml b/flightschedule/pom.xml
index 29562cd..79a8164 100644
--- a/flightschedule/pom.xml
+++ b/flightschedule/pom.xml
@@ -67,7 +67,7 @@
 			<artifactId>debezium-connector-yugabytedb</artifactId>
 			<version>1.0</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/debezium-connector-yugabytedb-1.3.5-BETA.jar</systemPath>
+			<systemPath>${project.basedir}/lib/debezium-connector-yugabytedb-1.9.5.y.33.SNAPSHOT.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>io.debezium</groupId>