diff --git a/analytics/docker-compose.yml b/analytics/docker-compose.yml
index bad6da6..f04e62c 100644
--- a/analytics/docker-compose.yml
+++ b/analytics/docker-compose.yml
@@ -38,7 +38,7 @@ services:
             - grafana
 
     influxdb:
-        image: 'influxdb:1.8'
+        image: influxdb:1.8
         container_name: influxdb
         restart: unless-stopped
         volumes:
@@ -94,8 +94,7 @@ services:
             - influxdb
 
     speedport-smart-reconnect:
-        build: https://git.karaolidis.com/Nikas36/speedport-smart-reconnect.git
-        image: speedport-smart-reconnect
+        image: registry.karaolidis.com/nikas36/speedport-smart-reconnect
         container_name: speedport_smart_reconnect
         restart: unless-stopped
         environment:
diff --git a/devops/docker-compose.yml b/devops/docker-compose.yml
index cdca0c6..ec54100 100644
--- a/devops/docker-compose.yml
+++ b/devops/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
     vscode:
-        image: codercom/code-server:custom_base_init
+        image: codercom/code-server
         container_name: vscode
         restart: unless-stopped
         environment:
@@ -17,7 +17,7 @@ services:
         user: '1000:1000'
 
     gitlab:
-        image: gitlab/gitlab-ce:latest
+        image: gitlab/gitlab-ce
         container_name: gitlab
         hostname: ${GITLAB_HOSTNAME}
         restart: unless-stopped
diff --git a/documents/docker-compose.yml b/documents/docker-compose.yml
index f0edb96..59f0e09 100644
--- a/documents/docker-compose.yml
+++ b/documents/docker-compose.yml
@@ -101,7 +101,7 @@ services:
             - outline_s3
 
     paperless:
-        image: jonaswinkler/paperless-ng:latest
+        image: jonaswinkler/paperless-ng
         container_name: paperless
         restart: unless-stopped
         depends_on:
diff --git a/ghost/docker-compose.yml b/ghost/docker-compose.yml
index 3c3d21d..7a2892a 100644
--- a/ghost/docker-compose.yml
+++ b/ghost/docker-compose.yml
@@ -15,8 +15,7 @@ services:
         user: '1000:1000'
 
     commento:
-        build: https://git.karaolidis.com/Nikas36/commento.git
-        image: commento:custom
+        image: registry.karaolidis.com/nikas36/commento
         container_name: commento
         restart: unless-stopped
         environment:
@@ -50,8 +49,7 @@ services:
         user: '1000:1000'
 
     umami:
-        build: https://git.karaolidis.com/Nikas36/umami.git
-        image: umami:custom
+        image: registry.karaolidis.com/nikas36/umami
         container_name: umami
         restart: unless-stopped
         environment:
diff --git a/lib_mgmt/docker-compose.yml b/lib_mgmt/docker-compose.yml
index 709e224..3fdd8c2 100644
--- a/lib_mgmt/docker-compose.yml
+++ b/lib_mgmt/docker-compose.yml
@@ -80,8 +80,7 @@ services:
             - sonarr
 
     subs_upload:
-        build: https://git.karaolidis.com/Nikas36/plex-subtitle-uploader.git
-        image: plex-subtitle-uploader
+        image: registry.karaolidis.com/nikas36/plex-subtitle-uploader
         container_name: subs_uploader
         restart: unless-stopped
         environment:
diff --git a/routing/docker-compose.yml b/routing/docker-compose.yml
index d84e415..9a3d352 100644
--- a/routing/docker-compose.yml
+++ b/routing/docker-compose.yml
@@ -93,8 +93,7 @@ services:
             - proxy
 
     yourls:
-        build: https://git.karaolidis.com/Nikas36/yourls-plugins.git
-        image: yourls:custom
+        image: registry.karaolidis.com/nikas36/yourls-plugins
         container_name: yourls
         restart: unless-stopped
         environment:
diff --git a/social/docker-compose.yml b/social/docker-compose.yml
index 1c51dc0..5a1bd99 100644
--- a/social/docker-compose.yml
+++ b/social/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
     peercalls:
-        image: 'peercalls/peercalls'
+        image: peercalls/peercalls
         container_name: peercalls
         restart: unless-stopped
         environment: