diff --git a/AndroidSDK/Dockerfile b/AndroidSDK/Dockerfile
index f76ff03..4c823f7 100644
--- a/AndroidSDK/Dockerfile
+++ b/AndroidSDK/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild AS ADK
+FROM git.zontreck.com/packages/debian:build AS ADK
 
 ENV ANDROID_HOME "/opt/android-sdk-linux"
 ENV ANDROID_SDK_VER 11076708
@@ -10,7 +10,7 @@ RUN unzip -qq /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip -d $ANDROID_
 RUN rm -v /commandlinetools-linux-${ANDROID_SDK_VER}_latest.zip
 ADD packages.txt /
 
-FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
+FROM git.zontreck.com/packages/debian:build
 
 ENV ANDROID_HOME "/opt/android-sdk-linux"
 ENV ANDROID_SDK_VER 11076708
diff --git a/AppImage/Dockerfile b/AppImage/Dockerfile
index 518c0e0..9221acd 100644
--- a/AppImage/Dockerfile
+++ b/AppImage/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:flutter
+FROM git.zontreck.com/packages/flutter:latest
 
 
 
diff --git a/ArchAgent/Dockerfile b/ArchAgent/Dockerfile
index cb1e153..abee93a 100644
--- a/ArchAgent/Dockerfile
+++ b/ArchAgent/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:archdev
+FROM git.zontreck.com/packages/arch:build
 
 ENV ARCHAGENT NAN
 
diff --git a/ArchBuilder/Dockerfile b/ArchBuilder/Dockerfile
index 4c724e5..116c104 100644
--- a/ArchBuilder/Dockerfile
+++ b/ArchBuilder/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:arch
+FROM git.zontreck.com/packages/arch:base
 
 RUN pacman --noconfirm -S base-devel gcc nasm git curl wget make cmake automake autoconf archiso squashfs-tools file
 
diff --git a/DIND/Agent/Dockerfile b/DIND/Agent/Dockerfile
new file mode 100644
index 0000000..2f46064
--- /dev/null
+++ b/DIND/Agent/Dockerfile
@@ -0,0 +1,15 @@
+FROM git.zontreck.com/packages/dind:latest
+
+ENV DOCKER_AGENT_SECRET NAN
+ENV DOCKER_USER NAN
+ENV DOCKER_PASSWORD NAN
+
+ADD entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+RUN apt-get install -y openjdk-17-jre
+
+
+RUN mkdir /builder
+
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/DINDAgent/entrypoint.sh b/DIND/Agent/entrypoint.sh
similarity index 100%
rename from DINDAgent/entrypoint.sh
rename to DIND/Agent/entrypoint.sh
diff --git a/DIND/Dockerfile b/DIND/Dockerfile
new file mode 100644
index 0000000..9800c04
--- /dev/null
+++ b/DIND/Dockerfile
@@ -0,0 +1,10 @@
+FROM git.zontreck.com/packages/debian:build
+
+ENV HOME /root
+
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y docker-compose curl moreutils
+
+USER root
+
+ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/DIND/Wings/Dockerfile b/DIND/Wings/Dockerfile
new file mode 100644
index 0000000..d25abdb
--- /dev/null
+++ b/DIND/Wings/Dockerfile
@@ -0,0 +1,11 @@
+FROM git.zontreck.com/packages/dind:latest
+
+RUN curl -L -o /usr/local/bin/wings "https://github.com/pelican-dev/wings/releases/latest/download/wings_linux_$([[ "$(uname -m)" == "x86_64" ]] && echo "amd64" || echo "arm64")"
+RUN mkdir -pv /etc/pelican /var/run/wings
+RUN chmod u+x /usr/local/bin/wings
+
+
+ADD ./entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/bin/bash" "/entrypoint.sh"]
\ No newline at end of file
diff --git a/DIND/Wings/entrypoint.sh b/DIND/Wings/entrypoint.sh
new file mode 100644
index 0000000..d0360b2
--- /dev/null
+++ b/DIND/Wings/entrypoint.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+wings
\ No newline at end of file
diff --git a/DINDAgent/Dockerfile b/DINDAgent/Dockerfile
deleted file mode 100644
index 46e34f0..0000000
--- a/DINDAgent/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
-
-ENV DOCKER_AGENT_SECRET NAN
-ENV DOCKER_USER NAN
-ENV DOCKER_PASSWORD NAN
-ENV HOME /root
-
-
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y openjdk-17-jdk docker-compose curl moreutils
-
-ADD entrypoint.sh /
-RUN chmod +x /entrypoint.sh
-
-
-RUN mkdir /builder
-USER root
-
-ENTRYPOINT ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/DebianBuilder/Dockerfile b/DebianBuilder/Dockerfile
index 3b15421..661dd3c 100644
--- a/DebianBuilder/Dockerfile
+++ b/DebianBuilder/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:debian
+FROM git.zontreck.com/packages/debian:base
 
 ENV GRADLE_VERSION 8.12
 RUN apt-get install -y build-essential  && apt-get clean -y
diff --git a/FlutterSdk/Dockerfile b/FlutterSdk/Dockerfile
index bd80889..a120b0b 100644
--- a/FlutterSdk/Dockerfile
+++ b/FlutterSdk/Dockerfile
@@ -1,11 +1,11 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:adk AS FLUTTER
+FROM git.zontreck.com/packages/adk:latest AS FLUTTER
 
 WORKDIR /
 RUN curl -sO https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.29.0-stable.tar.xz
 RUN tar -xf /flutter_linux_3.29.0-stable.tar.xz; rm /flutter*.xz
 
 
-FROM git.zontreck.com/ariascreations/buildenvironments:adk
+FROM git.zontreck.com/packages/adk:latest
 
 WORKDIR /
 ENV PATH $PATH:/flutter/bin
diff --git a/Jenkins/Dockerfile b/Jenkins/Dockerfile
index 6022675..9bbc61e 100644
--- a/Jenkins/Dockerfile
+++ b/Jenkins/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
+FROM git.zontreck.com/packages/debian:build
 
 RUN apt-get update
 RUN apt-get upgrade -y
diff --git a/Jenkinsfile b/Jenkinsfile
index 1a0730a..f2dfcdd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,8 +60,8 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
-                    docker push git.zontreck.com/ariascreations/buildenvironments:debian
+                    docker build -t git.zontreck.com/packages/debian:base DebianBase
+                    docker push git.zontreck.com/packages/debian:base
                     '''
                 }
             }
@@ -75,8 +75,8 @@ pipeline {
                     #!/bin/bash
 
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
-                    docker push git.zontreck.com/ariascreations/buildenvironments:debianbuild
+                    docker build -t git.zontreck.com/packages/debian:build DebianBuilder
+                    docker push git.zontreck.com/packages/debian:build
                     '''
                 }
             }
@@ -88,8 +88,8 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
-                    docker push git.zontreck.com/ariascreations/buildenvironments:adk
+                    docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
+                    docker push git.zontreck.com/packages/adk:latest
                     '''
                 }
             }
@@ -101,8 +101,8 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
-                    docker push git.zontreck.com/ariascreations/buildenvironments:flutter
+                    docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
+                    docker push git.zontreck.com/packages/flutter:latest
                     '''
                 }
             }
@@ -114,8 +114,8 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
-                    docker push git.zontreck.com/ariascreations/buildenvironments:appimage
+                    docker build -t git.zontreck.com/packages/appimage:latest AppImage
+                    docker push git.zontreck.com/packages/appimage:latest
                     '''
                 }
             }
@@ -127,8 +127,8 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGeneralCompiler
-                    docker push git.zontreck.com/ariascreations/buildenvironments:linux
+                    docker build -t git.zontreck.com/packages/buildenvironments:linux LinuxGeneralCompiler
+                    docker push git.zontreck.com/packages/buildenvironments:linux
                     '''
                 }
             }
@@ -140,8 +140,8 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
-                    docker push git.zontreck.com/ariascreations/buildenvironments:linuxfs
+                    docker build -t git.zontreck.com/packages/buildenvironments:linuxfs FirestormLinux
+                    docker push git.zontreck.com/packages/buildenvironments:linuxfs
                     '''
                 }
             }
@@ -153,8 +153,8 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
-                    docker push git.zontreck.com/ariascreations/buildenvironments:arch
+                    docker build -t git.zontreck.com/packages/arch:base ArchBase
+                    docker push git.zontreck.com/packages/arch:base
                     '''
                 }
             }
@@ -166,21 +166,27 @@ pipeline {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
-                    docker push git.zontreck.com/ariascreations/buildenvironments:archdev
+                    docker build -t git.zontreck.com/packages/arch:build ArchBuilder
+                    docker push git.zontreck.com/packages/arch:build
                     '''
                 }
             }
         }
 
-        stage("Build DIND Image") {
+        stage("Build DIND Images") {
             steps {
                 script {
                     sh '''
                     #!/bin/bash
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
-                    docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
+                    docker build -t git.zontreck.com/packages/dind:latest DIND
+                    docker push git.zontreck.com/packages/dind:latest
+
+                    docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
+                    docker push git.zontreck.com/packages/buildenvironments:dind
+
+                    docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
+                    docker push git.zontreck.com/packages/dind:wings
                     '''
                 }
             }
@@ -193,8 +199,8 @@ pipeline {
                     #!/bin/bash
 
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
-                    docker push git.zontreck.com/ariascreations/buildenvironments:nextcloud
+                    docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
+                    docker push git.zontreck.com/packages/nextcloud:latest
                     '''
                 }
             }
@@ -207,8 +213,8 @@ pipeline {
                     #!/bin/bash
 
 
-                    docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
-                    docker push git.zontreck.com/ariascreations/buildenvironments:jenkins
+                    docker build -t git.zontreck.com/packages/jenkins:latest Jenkins
+                    docker push git.zontreck.com/packages/jenkins:latest
                     '''
                 }
             }
diff --git a/LinuxGeneralCompiler/Dockerfile b/LinuxGeneralCompiler/Dockerfile
index c18c960..7a79a1a 100644
--- a/LinuxGeneralCompiler/Dockerfile
+++ b/LinuxGeneralCompiler/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:appimage AS BUILDER
+FROM git.zontreck.com/packages/appimage:latest AS BUILDER
 
 WORKDIR /
 RUN wget https://cdn.vintagestory.at/gamefiles/stable/vs_server_linux-x64_1.20.4.tar.gz
@@ -6,7 +6,7 @@ WORKDIR /vintagestory
 RUN tar -xvf /vs_server_linux-x64_1.20.4.tar.gz && rm /*.tar.gz
 
 
-FROM git.zontreck.com/ariascreations/buildenvironments:appimage
+FROM git.zontreck.com/packages/appimage:latest
 
 ENV PUB NAN
 ENV AGENT NAN
diff --git a/Megapahit/arch/Dockerfile b/Megapahit/arch/Dockerfile
index d6b6999..20e80d7 100644
--- a/Megapahit/arch/Dockerfile
+++ b/Megapahit/arch/Dockerfile
@@ -1,4 +1,4 @@
-FROM git.zontreck.com/ariascreations/buildenvironments:archdev
+FROM git.zontreck.com/packages/arch:build
 
 ADD fmodstudioapi20223linux.tar.gz /fmod.tar.gz
 
diff --git a/NextCloud/Dockerfile b/NextCloud/Dockerfile
index 6a08487..39edd80 100644
--- a/NextCloud/Dockerfile
+++ b/NextCloud/Dockerfile
@@ -15,7 +15,7 @@ RUN git submodule update --init --recursive
 RUN rm -rf .git
 
 
-FROM git.zontreck.com/ariascreations/buildenvironments:debianbuild
+FROM git.zontreck.com/packages/debian:build
 
 
 RUN apt-get install -y apache2 apache2-utils php8.2 php8.2-gd php8.2-mysql php8.2-mbstring php8.2-xml php8.2-imagick imagemagick unzip zip php8.2-zip php8.2-curl php8.2-sqlite rsync
diff --git a/build.bat b/build.bat
index a172ad4..3544300 100644
--- a/build.bat
+++ b/build.bat
@@ -1,20 +1,19 @@
 @echo off
 
+docker build -t git.zontreck.com/packages/debian:base DebianBase
+docker push git.zontreck.com/packages/debian:base
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
-docker push git.zontreck.com/ariascreations/buildenvironments:debian
+docker build -t git.zontreck.com/packages/debian:build DebianBuilder
+docker push git.zontreck.com/packages/debian:build
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
-docker push git.zontreck.com/ariascreations/buildenvironments:debianbuild
+docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
+docker push git.zontreck.com/packages/adk:latest
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
-docker push git.zontreck.com/ariascreations/buildenvironments:adk
+docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
+docker push git.zontreck.com/packages/flutter:latest
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
-docker push git.zontreck.com/ariascreations/buildenvironments:flutter
-
-docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
-docker push git.zontreck.com/ariascreations/buildenvironments:appimage
+docker build -t git.zontreck.com/packages/appimage:latest AppImage
+docker push git.zontreck.com/packages/appimage:latest
 
 docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
 docker push git.zontreck.com/ariascreations/buildenvironments:linuxfs
@@ -23,21 +22,26 @@ docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGen
 docker push git.zontreck.com/ariascreations/buildenvironments:linux
 
 
+
 docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
 docker push git.zontreck.com/ariascreations/buildenvironments:arch
 
 docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
 docker push git.zontreck.com/ariascreations/buildenvironments:archdev
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
-docker push git.zontreck.com/ariascreations/buildenvironments:archmegapahit
+
+docker build -t git.zontreck.com/packages/dind:latest DIND
+docker push git.zontreck.com/packages/dind:latest
+
+docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
+docker push git.zontreck.com/packages/buildenvironments:dind
+
+docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
+docker push git.zontreck.com/packages/dind:wings
 
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
-docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
+docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
+docker push git.zontreck.com/packages/nextcloud:latest
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
-docker push git.zontreck.com/ariascreations/buildenvironments:nextcloud
-
-docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
-docker push git.zontreck.com/ariascreations/buildenvironments:jenkins
\ No newline at end of file
+docker build -t git.zontreck.com/packages/jenkins:latest Jenkins
+docker push git.zontreck.com/packages/jenkins:latest
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 551a689..60097e5 100755
--- a/build.sh
+++ b/build.sh
@@ -1,19 +1,19 @@
 #!/bin/bash
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
-docker push git.zontreck.com/ariascreations/buildenvironments:debian
+docker build -t git.zontreck.com/packages/debian:base DebianBase
+docker push git.zontreck.com/packages/debian:base
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
-docker push git.zontreck.com/ariascreations/buildenvironments:debianbuild
+docker build -t git.zontreck.com/packages/debian:build DebianBuilder
+docker push git.zontreck.com/packages/debian:build
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
-docker push git.zontreck.com/ariascreations/buildenvironments:adk
+docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
+docker push git.zontreck.com/packages/adk:latest
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
-docker push git.zontreck.com/ariascreations/buildenvironments:flutter
+docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
+docker push git.zontreck.com/packages/flutter:latest
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
-docker push git.zontreck.com/ariascreations/buildenvironments:appimage
+docker build -t git.zontreck.com/packages/appimage:latest AppImage
+docker push git.zontreck.com/packages/appimage:latest
 
 docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
 docker push git.zontreck.com/ariascreations/buildenvironments:linuxfs
@@ -29,15 +29,19 @@ docker push git.zontreck.com/ariascreations/buildenvironments:arch
 docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
 docker push git.zontreck.com/ariascreations/buildenvironments:archdev
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
-docker push git.zontreck.com/ariascreations/buildenvironments:archmegapahit
+
+docker build -t git.zontreck.com/packages/dind:latest DIND
+docker push git.zontreck.com/packages/dind:latest
+
+docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
+docker push git.zontreck.com/packages/buildenvironments:dind
+
+docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
+docker push git.zontreck.com/packages/dind:wings
 
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
-docker push git.zontreck.com/ariascreations/buildenvironments:dindagent
+docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
+docker push git.zontreck.com/packages/nextcloud:latest
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
-docker push git.zontreck.com/ariascreations/buildenvironments:nextcloud
-
-docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
-docker push git.zontreck.com/ariascreations/buildenvironments:jenkins
\ No newline at end of file
+docker build -t git.zontreck.com/packages/jenkins:latest Jenkins
+docker push git.zontreck.com/packages/jenkins:latest
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 4a7427e..28b1f03 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     networks:
       - buildenv
   linuxfs:
-    image: git.zontreck.com/ariascreations/buildenvironments:linuxfs
+    image: git.zontreck.com/packages/buildenvironments:linuxfs
     container_name: linuxfs
     restart: unless-stopped
     env_file: .env
diff --git a/localbuild.sh b/localbuild.sh
index 0b94678..dfc612a 100755
--- a/localbuild.sh
+++ b/localbuild.sh
@@ -1,18 +1,21 @@
 #!/bin/bash
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:debian DebianBase
-docker build -t git.zontreck.com/ariascreations/buildenvironments:debianbuild DebianBuilder
-docker build -t git.zontreck.com/ariascreations/buildenvironments:adk AndroidSDK
-docker build -t git.zontreck.com/ariascreations/buildenvironments:flutter FlutterSdk
-docker build -t git.zontreck.com/ariascreations/buildenvironments:appimage AppImage
+docker build -t git.zontreck.com/packages/debian:base
+docker build -t git.zontreck.com/packages/debian:build
+docker build -t git.zontreck.com/packages/adk:latest AndroidSDK
+docker build -t git.zontreck.com/packages/flutter:latest FlutterSdk
+docker build -t git.zontreck.com/packages/appimage:latest AppImage
 docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
 docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGeneralCompiler
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
-docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
-docker build -t git.zontreck.com/ariascreations/buildenvironments:archmegapahit Megapahit/arch
+docker build -t git.zontreck.com/packages/arch:base ArchBase
+docker build -t git.zontreck.com/packages/arch:build ArchBuilder
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:dindagent DINDAgent
-docker build -t git.zontreck.com/ariascreations/buildenvironments:nextcloud NextCloud
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:jenkins Jenkins
\ No newline at end of file
+docker build -t git.zontreck.com/packages/dind:latest DIND
+docker build -t git.zontreck.com/packages/buildenvironments:dind DIND/Agent
+docker build -t git.zontreck.com/packages/dind:wings DIND/Wings
+
+docker build -t git.zontreck.com/packages/nextcloud:latest NextCloud
+
+docker build -t git.zontreck.com/packages/jenkins:latest Jenkins
\ No newline at end of file