diff --git a/audacity/Dockerfile b/audacity/Dockerfile
index 4feb688..7a72906 100644
--- a/audacity/Dockerfile
+++ b/audacity/Dockerfile
@@ -1,12 +1,12 @@
 FROM debian:bookworm-slim
 
-# x11docker --alsa $(find /dev/snd/ -type c | sed 's/^/--share /') oci.guero.top/audacity
+# x11docker --alsa $(find /dev/snd/ -type c | sed 's/^/--share /') oci.guero.org/audacity
 
 LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/audacity'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/audacity'
+LABEL org.opencontainers.image.title='oci.guero.org/audacity'
 LABEL org.opencontainers.image.description='Dockerized Audacity (X11)'
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/boringproxy/Dockerfile b/boringproxy/Dockerfile
index 2ce4519..b38a6ef 100644
--- a/boringproxy/Dockerfile
+++ b/boringproxy/Dockerfile
@@ -11,7 +11,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/boringproxy'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/boringproxy'
+LABEL org.opencontainers.image.title='oci.guero.org/boringproxy'
 LABEL org.opencontainers.image.description='Dockerized boringproxy'
 
 ARG DEFAULT_UID=1000
diff --git a/boringproxy/boringproxy-docker.sh b/boringproxy/boringproxy-docker.sh
index 849b333..45ff8dc 100755
--- a/boringproxy/boringproxy-docker.sh
+++ b/boringproxy/boringproxy-docker.sh
@@ -7,7 +7,7 @@ if ! command -v "$REALPATH" >/dev/null 2>&1; then
 fi
 
 ENGINE="${CONTAINER_ENGINE:-docker}"
-IMAGE="oci.guero.top/boringproxy:latest"
+IMAGE="oci.guero.org/boringproxy:latest"
 TRUSTED_CA=""
 CERTS_DIR=""
 DB_DIR="$(pwd)"
diff --git a/capa/Dockerfile b/capa/Dockerfile
index 610d2c7..d3a5e7c 100644
--- a/capa/Dockerfile
+++ b/capa/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/capa'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/capa'
+LABEL org.opencontainers.image.title='oci.guero.org/capa'
 LABEL org.opencontainers.image.description='Dockerized capa'
 
 ARG DEFAULT_UID=1000
diff --git a/capa/capa-docker.sh b/capa/capa-docker.sh
index 14418cd..c753348 100755
--- a/capa/capa-docker.sh
+++ b/capa/capa-docker.sh
@@ -2,7 +2,7 @@
 
 ENCODING="utf-8"
 
-IMAGE="${CAPA_IMAGE:-oci.guero.top/capa:latest}"
+IMAGE="${CAPA_IMAGE:-oci.guero.org/capa:latest}"
 ENGINE="${CONTAINER_ENGINE:-docker}"
 
 IN_FILE="$1"
diff --git a/ctfd/Dockerfile b/ctfd/Dockerfile
index c62ca2a..32727c8 100644
--- a/ctfd/Dockerfile
+++ b/ctfd/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/ctfd'
+LABEL org.opencontainers.image.title='oci.guero.org/ctfd'
 LABEL org.opencontainers.image.description='Dockerized CTFd'
 
 ARG DEFAULT_UID=1001
diff --git a/ctfd/docker-compose.yml b/ctfd/docker-compose.yml
index 6f0021b..d389f06 100644
--- a/ctfd/docker-compose.yml
+++ b/ctfd/docker-compose.yml
@@ -16,7 +16,7 @@ x-auth-variables: &auth-variables
 
 services:
   nginx:
-    image: oci.guero.top/nginx-ldap:latest
+    image: oci.guero.org/nginx-ldap:latest
     container_name: nginx
     hostname: nginx
     restart: unless-stopped
@@ -43,7 +43,7 @@ services:
       start_period: 120s
 
   ctfd:
-    image: oci.guero.top/ctfd:latest
+    image: oci.guero.org/ctfd:latest
     container_name: ctfd
     hostname: ctfd
     restart: unless-stopped
@@ -69,7 +69,7 @@ services:
     #   - "127.0.0.1:8000:8000"
 
   db:
-    image: oci.guero.top/mariadb:latest
+    image: oci.guero.org/mariadb:latest
     container_name: db
     hostname: db
     restart: unless-stopped
@@ -86,7 +86,7 @@ services:
     command: [mysqld, --user=mysql, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --wait_timeout=28800, --log-warnings=0]
 
   cache:
-    image: oci.guero.top/redis:latest
+    image: oci.guero.org/redis:latest
     container_name: cache
     hostname: cache
     restart: unless-stopped
diff --git a/fakemachine/Dockerfile b/fakemachine/Dockerfile
index c18925f..c6ec0b0 100644
--- a/fakemachine/Dockerfile
+++ b/fakemachine/Dockerfile
@@ -12,7 +12,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/fakemachine'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/fakemachine'
+LABEL org.opencontainers.image.title='oci.guero.org/fakemachine'
 LABEL org.opencontainers.image.description='Dockerized fakemachine'
 
 ARG DEFAULT_UID=1000
diff --git a/fetch/Dockerfile b/fetch/Dockerfile
index f15afad..bbcc824 100644
--- a/fetch/Dockerfile
+++ b/fetch/Dockerfile
@@ -10,7 +10,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/fetch'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/fetch'
+LABEL org.opencontainers.image.title='oci.guero.org/fetch'
 LABEL org.opencontainers.image.description='Dockerized fetch'
 
 
diff --git a/fetch/fetch-docker.sh b/fetch/fetch-docker.sh
index 0f95bda..1b95cb5 100755
--- a/fetch/fetch-docker.sh
+++ b/fetch/fetch-docker.sh
@@ -19,6 +19,6 @@ $ENGINE run -i -t --rm \
   "${UID_ARGS[@]}" \
   -v "$TEMP_DIR:/tmp/$TEMP_DIR_BASENAME:rw" \
   -w "/tmp/$TEMP_DIR_BASENAME" \
-  oci.guero.top/fetch "$@" "/tmp/$TEMP_DIR_BASENAME"
+  oci.guero.org/fetch "$@" "/tmp/$TEMP_DIR_BASENAME"
 
 mv "$TEMP_DIR"/* ./ >/dev/null 2>&1 || true
diff --git a/filepond/Dockerfile b/filepond/Dockerfile
index fc99c76..225341c 100644
--- a/filepond/Dockerfile
+++ b/filepond/Dockerfile
@@ -20,7 +20,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/filepond'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/filepond-nginx'
+LABEL org.opencontainers.image.title='oci.guero.org/filepond-nginx'
 LABEL org.opencontainers.image.description='FilePond with NGINX and PHP'
 
 ARG DEFAULT_UID=33
diff --git a/filepond/docker-compose.yml b/filepond/docker-compose.yml
index 25d943c..8586620 100644
--- a/filepond/docker-compose.yml
+++ b/filepond/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: oci.guero.top/filepond-nginx:latest
+    image: oci.guero.org/filepond-nginx:latest
     restart: "no"
     stdin_open: false
     tty: true
diff --git a/firefox/Dockerfile b/firefox/Dockerfile
index 183f9ca..a1d7f90 100644
--- a/firefox/Dockerfile
+++ b/firefox/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/firefox'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/firefox'
+LABEL org.opencontainers.image.title='oci.guero.org/firefox'
 LABEL org.opencontainers.image.description='Dockerized Firefox (X11)'
 
 #    function firefoxd() {
@@ -52,7 +52,7 @@ LABEL org.opencontainers.image.description='Dockerized Firefox (X11)'
 #        $GPU_DEVICES \
 #        --group-add $(getent group audio | cut -d: -f3) \
 #        --name firefox \
-#        oci.guero.top/firefox "$@"
+#        oci.guero.org/firefox "$@"
 #    }
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/firefox/firefox-docker.sh b/firefox/firefox-docker.sh
index f9cbd47..b95d341 100755
--- a/firefox/firefox-docker.sh
+++ b/firefox/firefox-docker.sh
@@ -70,5 +70,5 @@ else
     $GPU_DEVICES \
     --group-add $(getent group audio | cut -d: -f3) \
     --name firefox \
-    oci.guero.top/firefox "$@"
+    oci.guero.org/firefox "$@"
 fi
\ No newline at end of file
diff --git a/forgejo/Dockerfile b/forgejo/Dockerfile
index 3fbeecf..ca8e9a4 100644
--- a/forgejo/Dockerfile
+++ b/forgejo/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/forgejo'
+LABEL org.opencontainers.image.title='oci.guero.org/forgejo'
 LABEL org.opencontainers.image.description='Dockerized Forgejo unsafely running as root'
 
 RUN sed -i '/^RUN_MODE[[:space:]]*=.*/a RUN_USER = root\nI_AM_BEING_UNSAFE_RUNNING_AS_ROOT = true' /etc/templates/app.ini
diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml
index 2bfa0dc..b7cac24 100644
--- a/forgejo/docker-compose.yml
+++ b/forgejo/docker-compose.yml
@@ -15,7 +15,7 @@ services:
     #   (may need to manually chown .ssh directory upon startup?)
     #
     # podman (rootless):
-    image: oci.guero.top/forgejo:root
+    image: oci.guero.org/forgejo:root
     #
     build:
       context: .
diff --git a/gimp/Dockerfile b/gimp/Dockerfile
index 07e92e7..0bd6de5 100644
--- a/gimp/Dockerfile
+++ b/gimp/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/gimp'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/gimp'
+LABEL org.opencontainers.image.title='oci.guero.org/gimp'
 LABEL org.opencontainers.image.description='Dockerized GIMP (X11)'
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/gimp/gimp-docker.sh b/gimp/gimp-docker.sh
index 94777df..8a5b515 100755
--- a/gimp/gimp-docker.sh
+++ b/gimp/gimp-docker.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-IMAGE="${GIMP_IMAGE:-oci.guero.top/gimp:latest}"
+IMAGE="${GIMP_IMAGE:-oci.guero.org/gimp:latest}"
 ENGINE="${CONTAINER_ENGINE:-docker}"
 if [[ "$ENGINE" == "podman" ]]; then
   CONTAINER_PUID=0
diff --git a/gitea/Dockerfile b/gitea/Dockerfile
index c0f5eb4..b0d7739 100644
--- a/gitea/Dockerfile
+++ b/gitea/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/gitea'
+LABEL org.opencontainers.image.title='oci.guero.org/gitea'
 LABEL org.opencontainers.image.description='Dockerized Gitea unsafely running as root'
 
 RUN sed -i '/^RUN_MODE[[:space:]]*=.*/a RUN_USER = root\nI_AM_BEING_UNSAFE_RUNNING_AS_ROOT = true' /etc/templates/app.ini
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 1751218..1a0a42f 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -14,7 +14,7 @@ services:
     #   (may need to manually chown .ssh directory upon startup?)
     #
     # podman (rootless):
-    image: oci.guero.top/gitea:root
+    image: oci.guero.org/gitea:root
     #
     build:
       context: .
diff --git a/libreoffice-browser/docker-compose.yml b/libreoffice-browser/docker-compose.yml
index 01a0599..24d1f01 100644
--- a/libreoffice-browser/docker-compose.yml
+++ b/libreoffice-browser/docker-compose.yml
@@ -47,7 +47,7 @@ services:
       - /usr/share/fonts:/usr/share/fonts/host:z
 
   nginx-ldap:
-    image: oci.guero.top/nginx-ldap:latest
+    image: oci.guero.org/nginx-ldap:latest
     container_name: nginx-ldap
     hostname: nginx-ldap
     restart: unless-stopped
diff --git a/lossless-cut/Dockerfile b/lossless-cut/Dockerfile
index 970b69c..2fa4549 100644
--- a/lossless-cut/Dockerfile
+++ b/lossless-cut/Dockerfile
@@ -1,13 +1,13 @@
 FROM debian:bookworm-slim
 
 # https://github.com/mifi/lossless-cut
-# x11docker --pulseaudio --gpu oci.guero.top/lossless-cut:latest
+# x11docker --pulseaudio --gpu oci.guero.org/lossless-cut:latest
 
 LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/lossless-cut'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/lossless-cut'
+LABEL org.opencontainers.image.title='oci.guero.org/lossless-cut'
 LABEL org.opencontainers.image.description='Dockerized LosslessCut'
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index a7a5fc0..b051d0b 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/mariadb'
+LABEL org.opencontainers.image.title='oci.guero.org/mariadb'
 LABEL org.opencontainers.image.description='Dockerized MariaDB'
 
 ARG DEFAULT_UID=999
diff --git a/mastodon-linuxserver-io/Dockerfile b/mastodon-linuxserver-io/Dockerfile
index 270113a..fcdc2ad 100644
--- a/mastodon-linuxserver-io/Dockerfile
+++ b/mastodon-linuxserver-io/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/mastodon-linuxserver-io'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/mastodon'
+LABEL org.opencontainers.image.title='oci.guero.org/mastodon'
 LABEL org.opencontainers.image.description='Dockerized Mastodon'
 
 RUN sed -i -n '/^[[:space:]]*listen.*[::]/!p' /defaults/nginx/site-confs/default.conf.sample && \
diff --git a/mastodon-linuxserver-io/docker-compose.yml b/mastodon-linuxserver-io/docker-compose.yml
index ca624ef..b9b6cb6 100644
--- a/mastodon-linuxserver-io/docker-compose.yml
+++ b/mastodon-linuxserver-io/docker-compose.yml
@@ -3,7 +3,7 @@ version: "2.1"
 services:
 
   mastodon:
-    image: oci.guero.top/mastodon:latest
+    image: oci.guero.org/mastodon:latest
     build:
       context: .
       dockerfile: Dockerfile
diff --git a/mastodon-linuxserver-io/env_setup.sh b/mastodon-linuxserver-io/env_setup.sh
index 4564b78..7c5b8fd 100755
--- a/mastodon-linuxserver-io/env_setup.sh
+++ b/mastodon-linuxserver-io/env_setup.sh
@@ -30,7 +30,7 @@ SCRIPT_PATH="$($DIRNAME $($REALPATH -e "${BASH_SOURCE[0]}"))"
 pushd "$SCRIPT_PATH" >/dev/null 2>&1
 
 # stuff for running the image to generate secrets
-MASTODON_IMAGE=${MASTODON_IMAGE:-oci.guero.top/mastodon:latest}
+MASTODON_IMAGE=${MASTODON_IMAGE:-oci.guero.org/mastodon:latest}
 CONTAINER_ENGINE="${CONTAINER_ENGINE:-docker}"
 if [[ "$CONTAINER_ENGINE" == "podman" ]]; then
   DEFAULT_UID=0
diff --git a/mattermost/docker-compose.yml b/mattermost/docker-compose.yml
index 9d460df..492815d 100644
--- a/mattermost/docker-compose.yml
+++ b/mattermost/docker-compose.yml
@@ -20,7 +20,7 @@ services:
     build:
       context: .
       dockerfile: docker/postgres.Dockerfile
-    image: oci.guero.top/postgres:14-alpine
+    image: oci.guero.org/postgres:14-alpine
     environment:
       << : *process-variables
       POSTGRES_USER: ${POSTGRES_USER}
@@ -40,7 +40,7 @@ services:
     build:
       context: .
       dockerfile: docker/mattermost.Dockerfile
-    image: oci.guero.top/mattermost-server:latest
+    image: oci.guero.org/mattermost-server:latest
     environment:
       << : *process-variables
       POSTGRES_USER: ${POSTGRES_USER}
diff --git a/mattermost/docker/mattermost.Dockerfile b/mattermost/docker/mattermost.Dockerfile
index b1c06b3..b3d6db1 100644
--- a/mattermost/docker/mattermost.Dockerfile
+++ b/mattermost/docker/mattermost.Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/mattermost'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/mattermost-server'
+LABEL org.opencontainers.image.title='oci.guero.org/mattermost-server'
 LABEL org.opencontainers.image.description='Dockerized Mattermost Server'
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/mimic3/docker-compose.yml b/mimic3/docker-compose.yml
index ec60be8..653e0f3 100644
--- a/mimic3/docker-compose.yml
+++ b/mimic3/docker-compose.yml
@@ -2,8 +2,8 @@ version: '3.7'
 
 services:
   mimic:
-    # image: oci.guero.top/mimic3:gpu
-    image: oci.guero.top/mimic3:latest
+    # image: oci.guero.org/mimic3:gpu
+    image: oci.guero.org/mimic3:latest
     ports:
       - "127.0.0.1:59125:59125"
     volumes:
diff --git a/net-clients/Dockerfile b/net-clients/Dockerfile
index 435dca3..03c6e56 100644
--- a/net-clients/Dockerfile
+++ b/net-clients/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/net-clients'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/net-clients'
+LABEL org.opencontainers.image.title='oci.guero.org/net-clients'
 LABEL org.opencontainers.image.description='Dockerized Network Client Utilities'
 
 RUN apk add --no-cache \
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 4b2ee23..3ffaaf0 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - proxy
 
   nextcloud:
-    image: oci.guero.top/nextcloud:latest
+    image: oci.guero.org/nextcloud:latest
     build:
       context: .
       dockerfile: docker/Dockerfile
diff --git a/nextcloud/docker/Dockerfile b/nextcloud/docker/Dockerfile
index 657c45e..b5df13f 100644
--- a/nextcloud/docker/Dockerfile
+++ b/nextcloud/docker/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nextcloud'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/nextcloud'
+LABEL org.opencontainers.image.title='oci.guero.org/nextcloud'
 LABEL org.opencontainers.image.description='Dockerized Nextcloud'
 
 RUN apt-get update && \
diff --git a/nginx-securimage/docker-compose.yml b/nginx-securimage/docker-compose.yml
index 021edf3..fcf8b5f 100644
--- a/nginx-securimage/docker-compose.yml
+++ b/nginx-securimage/docker-compose.yml
@@ -7,7 +7,7 @@ version: '3'
 
 services:
   web:
-    image: oci.guero.top/nginx-securimage:latest
+    image: oci.guero.org/nginx-securimage:latest
     container_name: nginx-securimage
     build:
       context: .
diff --git a/nginx-securimage/docker/nginx.Dockerfile b/nginx-securimage/docker/nginx.Dockerfile
index d98d384..02cc1ba 100644
--- a/nginx-securimage/docker/nginx.Dockerfile
+++ b/nginx-securimage/docker/nginx.Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nginx-securimage'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/nginx-securimage'
+LABEL org.opencontainers.image.title='oci.guero.org/nginx-securimage'
 LABEL org.opencontainers.image.description='Dockerized NGINX with Securimage PHP Captcha'
 
 ENV WEBROOT /var/www/html
diff --git a/opensearch/docker-compose.yml b/opensearch/docker-compose.yml
index 4141e39..2dad29e 100644
--- a/opensearch/docker-compose.yml
+++ b/opensearch/docker-compose.yml
@@ -9,7 +9,7 @@ services:
   #   same parent repository as this project and just run that
 
   opensearch-node1:
-    image: oci.guero.top/opensearch:latest
+    image: oci.guero.org/opensearch:latest
     # userns_mode: keep-id
     build:
       context: .
@@ -64,7 +64,7 @@ services:
       - default
 
   opensearch-node2:
-    image: oci.guero.top/opensearch:latest
+    image: oci.guero.org/opensearch:latest
     # userns_mode: keep-id
     build:
       context: .
@@ -122,7 +122,7 @@ services:
       - default
 
   opensearch-node3:
-    image: oci.guero.top/opensearch:latest
+    image: oci.guero.org/opensearch:latest
     # userns_mode: keep-id
     build:
       context: .
@@ -180,7 +180,7 @@ services:
       - default
 
   opensearch-node4:
-    image: oci.guero.top/opensearch:latest
+    image: oci.guero.org/opensearch:latest
     # userns_mode: keep-id
     build:
       context: .
@@ -238,7 +238,7 @@ services:
       - default
 
   opensearch-dashboards:
-    image: oci.guero.top/opensearch-dashboards:latest
+    image: oci.guero.org/opensearch-dashboards:latest
     # userns_mode: keep-id
     build:
       context: .
diff --git a/owntracks/docker-compose.yml b/owntracks/docker-compose.yml
index d9beb62..69fa1d9 100644
--- a/owntracks/docker-compose.yml
+++ b/owntracks/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - ./store:/store:rw
 
   nginx:
-    image: oci.guero.top/nginx-ldap:latest
+    image: oci.guero.org/nginx-ldap:latest
     container_name: nginx
     hostname: nginx
     restart: "no"
diff --git a/postgres/Dockerfile b/postgres/Dockerfile
index 0ccf976..d5bddc9 100644
--- a/postgres/Dockerfile
+++ b/postgres/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/postgres'
+LABEL org.opencontainers.image.title='oci.guero.org/postgres'
 LABEL org.opencontainers.image.description='Dockerized PostgreSQL'
 
 ARG DEFAULT_UID=1000
diff --git a/serverless-registry-proxy/docker-compose.yml b/serverless-registry-proxy/docker-compose.yml
index ed9a107..dc3446d 100644
--- a/serverless-registry-proxy/docker-compose.yml
+++ b/serverless-registry-proxy/docker-compose.yml
@@ -6,7 +6,7 @@ version: "3.9"
 
 services:
   serverless-registry-proxy:
-    image: oci.guero.top/gcr-proxy:latest
+    image: oci.guero.org/gcr-proxy:latest
     restart: unless-stopped
     container_name: serverless-registry-proxy
     ports:
diff --git a/signal/Dockerfile b/signal/Dockerfile
index 6a54c82..bc9c5d0 100644
--- a/signal/Dockerfile
+++ b/signal/Dockerfile
@@ -13,7 +13,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/signal'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/signal'
+LABEL org.opencontainers.image.title='oci.guero.org/signal'
 LABEL org.opencontainers.image.description='Dockerized Signal (X11)'
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/smtp4dev/docker-compose.yml b/smtp4dev/docker-compose.yml
index 1aa6cdb..bafe82a 100644
--- a/smtp4dev/docker-compose.yml
+++ b/smtp4dev/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - ServerOptions__DisableIPv6=true
 
   stunnel-smtp:
-    image: oci.guero.top/stunnel:latest
+    image: oci.guero.org/stunnel:latest
     hostname: stunnel-smtp
     container_name: stunnel-smtp
     restart: unless-stopped
@@ -35,7 +35,7 @@ services:
       - smtp4dev
 
   stunnel-imap:
-    image: oci.guero.top/stunnel:latest
+    image: oci.guero.org/stunnel:latest
     hostname: stunnel-imap
     container_name: stunnel-imap
     restart: unless-stopped
@@ -53,7 +53,7 @@ services:
       - smtp4dev
 
   stunnel-http:
-    image: oci.guero.top/stunnel:latest
+    image: oci.guero.org/stunnel:latest
     hostname: stunnel-http
     container_name: stunnel-http
     restart: unless-stopped
diff --git a/stunnel/Dockerfile b/stunnel/Dockerfile
index c20a8f7..8ba4c16 100644
--- a/stunnel/Dockerfile
+++ b/stunnel/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/stunnel'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/stunnel'
+LABEL org.opencontainers.image.title='oci.guero.org/stunnel'
 LABEL org.opencontainers.image.description='Dockerized stunnel'
 
 RUN apk --no-cache add openssl && \
diff --git a/tunneler/Dockerfile b/tunneler/Dockerfile
index da67eb5..a9ee32a 100644
--- a/tunneler/Dockerfile
+++ b/tunneler/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/tunneler'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/tunneler'
+LABEL org.opencontainers.image.title='oci.guero.org/tunneler'
 LABEL org.opencontainers.image.description='Dockerized Tunneling Services'
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/tunneler/docker-compose.yml b/tunneler/docker-compose.yml
index 65c1994..93fe048 100644
--- a/tunneler/docker-compose.yml
+++ b/tunneler/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: oci.guero.top/tunneler:latest
+    image: oci.guero.org/tunneler:latest
     container_name: tunneler
     ulimits:
       memlock:
diff --git a/unifi/docker-compose.yml b/unifi/docker-compose.yml
index 0b77e88..8400242 100644
--- a/unifi/docker-compose.yml
+++ b/unifi/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   unifi:
     build:
       context: .
-    image: oci.guero.top/unifi:latest
+    image: oci.guero.org/unifi:latest
     restart: "unless-stopped"
     volumes:
       - ./config:/config:rw
diff --git a/wireproxy/Dockerfile b/wireproxy/Dockerfile
index 7ed1836..e05318c 100644
--- a/wireproxy/Dockerfile
+++ b/wireproxy/Dockerfile
@@ -12,7 +12,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/wireproxy'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/wireproxy'
+LABEL org.opencontainers.image.title='oci.guero.org/wireproxy'
 LABEL org.opencontainers.image.description='Dockerized wireproxy'
 
 ARG DEFAULT_UID=1000
diff --git a/wireproxy/docker-compose.yml b/wireproxy/docker-compose.yml
index d12d5c0..b504e23 100644
--- a/wireproxy/docker-compose.yml
+++ b/wireproxy/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    image: oci.guero.top/wireproxy:latest
+    image: oci.guero.org/wireproxy:latest
     container_name: wireproxy
     environment:
       << : *process-variables
diff --git a/xfce/Dockerfile b/xfce/Dockerfile
index 00c7d8d..673087f 100644
--- a/xfce/Dockerfile
+++ b/xfce/Dockerfile
@@ -33,7 +33,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/xfce'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/xfce:base'
+LABEL org.opencontainers.image.title='oci.guero.org/xfce:base'
 LABEL org.opencontainers.image.description='Dockerized XFCE with my own special blend of herbs and spices'
 
 RUN apt-get update && apt-mark hold iptables && \
@@ -109,7 +109,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/xfce'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/xfce:latest'
+LABEL org.opencontainers.image.title='oci.guero.org/xfce:latest'
 LABEL org.opencontainers.image.description='Dockerized XFCE with my own special blend of herbs and spices'
 
 # liberally steal some package lists and config scripts from my live USB image setup one of my other repos
diff --git a/yt-dlp/Dockerfile b/yt-dlp/Dockerfile
index 872e1a8..f50dd96 100644
--- a/yt-dlp/Dockerfile
+++ b/yt-dlp/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="mero.mero.guero@gmail.com"
 LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com'
 LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/yt-dlp'
 LABEL org.opencontainers.image.source='https://github.com/mmguero/docker'
-LABEL org.opencontainers.image.title='oci.guero.top/yt-dlp'
+LABEL org.opencontainers.image.title='oci.guero.org/yt-dlp'
 LABEL org.opencontainers.image.description='Dockerized yt-dlp'
 
 ARG DEFAULT_UID=1000
diff --git a/yt-dlp/yt-dlp-docker.sh b/yt-dlp/yt-dlp-docker.sh
index f2433c2..ce157f3 100755
--- a/yt-dlp/yt-dlp-docker.sh
+++ b/yt-dlp/yt-dlp-docker.sh
@@ -16,4 +16,4 @@ $ENGINE run -i -t --rm \
   -e PGID=$CONTAINER_PGID \
   -v "$DIR:$DIR:rw" \
   -w "$DIR" \
-  oci.guero.top/yt-dlp "$@"
+  oci.guero.org/yt-dlp "$@"