diff --git a/.env.example b/.env.example
index d35eb56..a2d35ed 100644
--- a/.env.example
+++ b/.env.example
@@ -14,10 +14,10 @@ CONTAINER_NAME_BACKUP=backup
 
 # Docker images
 #
-DOCKER_IMAGE_GITLAB=sameersbn/gitlab:latest
-DOCKER_IMAGE_PGSQL=sameersbn/postgresql:latest
-DOCKER_IMAGE_REDIS=sameersbn/redis:latest
-DOCKER_IMAGE_REGISTRY=registry:latest
+DOCKER_IMAGE_GITLAB=sameersbn/gitlab:17.9.2
+DOCKER_IMAGE_PGSQL=bitnami/postgresql:16.4.0
+DOCKER_IMAGE_REDIS=redis:latest
+DOCKER_IMAGE_REGISTRY=registry:2.8.3
 DOCKER_IMAGE_RUNNER=vasyakrg/gitlab-runner
 DOCKER_IMAGE_BACKUP=vasyakrg/gitlab-backup
 
diff --git a/docker-compose.yml b/docker-compose.yml
index a061bd8..b56e9d1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -143,12 +143,12 @@ services:
       container_name: ${SERVICE_NAME}_${CONTAINER_NAME_PGSQL}
       restart: always
       environment:
-        - DB_USER=${DB_USER}
-        - DB_PASS=${DB_PASS}
-        - DB_NAME=${DB_NAME}
-        - DB_EXTENSION=pg_trgm,btree_gist
+        - POSTGRESQL_USERNAME=${DB_USER}
+        - POSTGRESQL_PASSWORD=${DB_PASS}
+        - POSTGRESQL_DATABASE=${DB_NAME}
+        - POSTGRESQL_SHARED_PRELOAD_LIBRARIES=pg_trgm,btree_gist
       volumes:
-        - ${SERVICE_DATA}/${SERVICE_NAME}/postgresql:/var/lib/postgresql:Z
+        - postgresql_data:/bitnami/postgresql/:Z
       networks:
         - ${SERVICE_NETWORK}
 
@@ -205,48 +205,6 @@ services:
       networks:
         - ${SERVICE_NETWORK}
 
-    runner_3:
-      image: ${DOCKER_IMAGE_RUNNER}
-      container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_3
-      restart: always
-      depends_on:
-        - gitlab
-      volumes:
-        - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_3:/etc/gitlab-runner
-        - /var/run/docker.sock:/var/run/docker.sock
-      command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
-      environment:
-        - CI_SERVER_URL=https://${GITLAB_HOST}
-        - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-        - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
-        - RUNNER_TOKEN=${RUNNER_TOKEN}
-        - RUNNER_DESCRIPTION=gitab-runner_3
-        - RUNNER_EXECUTOR=docker
-        - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-      networks:
-        - ${SERVICE_NETWORK}
-
-    runner_4:
-      image: ${DOCKER_IMAGE_RUNNER}
-      container_name: ${SERVICE_NAME}_${CONTAINER_NAME_RUNNER}_4
-      restart: always
-      depends_on:
-        - gitlab
-      volumes:
-        - ${SERVICE_DATA}/${SERVICE_NAME}/gitlab-runner_4:/etc/gitlab-runner
-        - /var/run/docker.sock:/var/run/docker.sock
-      command: --debug run --user=gitlab-runner --working-directory=/home/gitlab-runner
-      environment:
-        - CI_SERVER_URL=https://${GITLAB_HOST}
-        - CI_SERVER_WITH_RUNNER=${CI_SERVER_WITH_RUNNER}
-        - CI_SERVER_LOCAL_IP=${CI_SERVER_LOCAL_IP}
-        - RUNNER_TOKEN=${RUNNER_TOKEN}
-        - RUNNER_DESCRIPTION=gitab-runner_4
-        - RUNNER_EXECUTOR=docker
-        - DOCKER_IMAGE=gitlab/gitlab-runner-helper:x86_64-latest
-      networks:
-       - ${SERVICE_NETWORK}
-
     # backup:
     #   image: ${DOCKER_IMAGE_BACKUP}
     #   restart: always
@@ -274,3 +232,7 @@ networks:
     webproxy:
         external:
             name: ${WEBPROXY_NETWORK}
+
+volumes:
+  postgresql_data:
+    driver: local
\ No newline at end of file