diff --git a/docker-compose.yml b/docker-compose.yml
index d47a260..31f0051 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,6 @@ services:
       POSTGRES_USER: nxtgauge
       POSTGRES_PASSWORD: nxtgauge_dev
       POSTGRES_DB: nxtgauge_db
-    ports:
-      - "5432:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
       - ./scripts/seed.sql:/docker-entrypoint-initdb.d/seed.sql
@@ -20,8 +18,6 @@ services:
   redis:
     image: redis:7-alpine
     restart: unless-stopped
-    ports:
-      - "6379:6379"
     volumes:
       - redisdata:/data
     command: redis-server --appendonly yes
@@ -35,11 +31,12 @@ services:
 
   gateway:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-gateway:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-gateway:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     ports:
       - "9100:9100"
     environment:
       PORT: "9100"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -107,9 +104,10 @@ services:
 
   users:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-users:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-users:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9101"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -121,9 +119,10 @@ services:
 
   companies:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-companies:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-companies:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9102"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -135,9 +134,10 @@ services:
 
   jobs:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-jobs:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-jobs:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9103"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
     depends_on:
       postgres:
@@ -145,9 +145,10 @@ services:
 
   job-seekers:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-job-seekers:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-job-seekers:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9104"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -159,9 +160,10 @@ services:
 
   customers:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-customers:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-customers:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9105"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -173,9 +175,10 @@ services:
 
   employees:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-employees:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-employees:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9106"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -189,9 +192,10 @@ services:
 
   photographers:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-photographers:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-photographers:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9107"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -203,9 +207,10 @@ services:
 
   tutors:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-tutors:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-tutors:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9108"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -217,9 +222,10 @@ services:
 
   makeup-artists:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-makeup-artists:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-makeup-artists:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9109"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -231,9 +237,10 @@ services:
 
   developers:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-developers:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-developers:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9110"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -245,9 +252,10 @@ services:
 
   video-editors:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-video-editors:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-video-editors:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9111"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -259,9 +267,10 @@ services:
 
   graphic-designers:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-graphic-designers:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-graphic-designers:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9112"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -273,9 +282,10 @@ services:
 
   social-media-managers:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-social-media-managers:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-social-media-managers:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9113"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -287,9 +297,10 @@ services:
 
   fitness-trainers:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-fitness-trainers:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-fitness-trainers:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9114"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -301,9 +312,10 @@ services:
 
   catering-services:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-catering-services:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-catering-services:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9115"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -317,9 +329,10 @@ services:
 
   payments:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-payments:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-payments:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9116"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret
@@ -333,9 +346,10 @@ services:
 
   ugc-content-creators:
     platform: linux/amd64
-    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-ugc-content-creators:high-performance-latest
+    image: ci.nxtgauge.com/ashwin/nxtgauge-rust-ugc-content-creators:cd695514fe1b54b6b4b4505d75e4fe7318fb0198
     environment:
       PORT: "9117"
+      MOCK_STORAGE: "true"
       DATABASE_URL: postgresql://nxtgauge:nxtgauge_dev@postgres:5432/nxtgauge_db
       REDIS_URL: redis://redis:6379
       JWT_SECRET: local_dev_jwt_secret