diff --git a/README.md b/README.md
index ab20574a..545b4785 100644
--- a/README.md
+++ b/README.md
@@ -68,11 +68,12 @@ sudo yum update -y && \
 sudo yum install -y docker git && \
 sudo service docker start && \
 sudo usermod -a -G docker $USER && \
-sudo curl -L "https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose && \
+sudo wget -O /usr/local/bin/docker-compose https://github.com/docker/compose/releases/download/v2.19.1/docker-compose-$(uname -s)-$(uname -m) && \
 sudo mv /usr/local/bin/docker-compose /usr/bin/docker-compose && \
 sudo chmod +x /usr/bin/docker-compose && \
-git clone https://github.com/tableflowhq/tableflow.git && cd tableflow && \
-cp .env.example .env && \
+mkdir tableflow && cd tableflow && \
+wget https://raw.githubusercontent.com/tableflowhq/tableflow/main/{.env.example,docker-compose.yml,docker-compose.base.yml} && \
+mv .env.example .env && \
 sg docker -c 'docker-compose up -d'
 ```
 
diff --git a/docker-compose-image.yml b/docker-compose-build.yml
similarity index 85%
rename from docker-compose-image.yml
rename to docker-compose-build.yml
index 64ca30e0..c283aa04 100644
--- a/docker-compose-image.yml
+++ b/docker-compose-build.yml
@@ -12,7 +12,10 @@ services:
       service: scylla
 
   backend:
-    image: tableflow/admin-server
+    build: "./admin-server"
+    extends:
+      file: docker-compose.base.yml
+      service: backend
     depends_on:
       postgres:
         condition: service_healthy
@@ -23,7 +26,7 @@ services:
     depends_on:
       backend:
         condition: service_healthy
-    image: tableflow/admin-ui
+    build: "./admin-ui"
     platform: linux/amd64
     # Un-comment if using Apple silicon
     #platform: linux/arm64
@@ -37,7 +40,7 @@ services:
     depends_on:
       backend:
         condition: service_healthy
-    image: tableflow/importer-ui
+    build: "./importer-ui"
     platform: linux/amd64
     # Un-comment if using Apple silicon
     #platform: linux/arm64
diff --git a/docker-compose.base.yml b/docker-compose.base.yml
index 1bffe686..fa44ba55 100644
--- a/docker-compose.base.yml
+++ b/docker-compose.base.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   postgres:
-    image: 'postgres:latest'
+    image: "postgres:15.4"
     environment:
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
@@ -14,13 +14,13 @@ services:
     restart: unless-stopped
     command: -p ${POSTGRES_PORT}
     healthcheck:
-      test: ['CMD', 'pg_isready', '-p',  '${POSTGRES_PORT}']
+      test: ["CMD", "pg_isready", "-p", "${POSTGRES_PORT}"]
       interval: 5s
       timeout: 5s
-      retries: 5
+      retries: 10
 
   scylla:
-    image: scylladb/scylla:latest
+    image: scylladb/scylla:5.2
     container_name: scylla
     ports:
       - "9042:9042"
@@ -30,12 +30,11 @@ services:
     command: --authorizer=AllowAllAuthorizer
     healthcheck:
       test: ["CMD", "cqlsh", "-e", "DESCRIBE KEYSPACES;"]
-      interval: 10s
+      interval: 5s
       timeout: 5s
-      retries: 10
+      retries: 30
 
   backend:
-    build: "./admin-server"
     platform: linux/amd64
     ports:
       - "3003:3003"
diff --git a/docker-compose.dev-frontend.yml b/docker-compose.dev-frontend.yml
index 1e6e73da..9a7211e9 100644
--- a/docker-compose.dev-frontend.yml
+++ b/docker-compose.dev-frontend.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "4"
 
 services:
   postgres:
@@ -12,6 +12,7 @@ services:
       service: scylla
 
   backend:
+    build: "./admin-server"
     extends:
       file: docker-compose.base.yml
       service: backend
diff --git a/docker-compose.yml b/docker-compose.yml
index d77c401b..80eca71b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,7 @@ services:
       service: scylla
 
   backend:
+    image: registry-1.docker.io/tableflow/admin-server
     extends:
       file: docker-compose.base.yml
       service: backend
@@ -25,7 +26,7 @@ services:
     depends_on:
       backend:
         condition: service_healthy
-    build: "./admin-ui"
+    image: registry-1.docker.io/tableflow/admin-ui
     platform: linux/amd64
     # Un-comment if using Apple silicon
     #platform: linux/arm64
@@ -39,7 +40,7 @@ services:
     depends_on:
       backend:
         condition: service_healthy
-    build: "./importer-ui"
+    image: registry-1.docker.io/tableflow/importer-ui
     platform: linux/amd64
     # Un-comment if using Apple silicon
     #platform: linux/arm64