diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
new file mode 100644
index 0000000..25a64e7
--- /dev/null
+++ b/.github/workflows/docker-publish.yml
@@ -0,0 +1,62 @@
+name: Docker
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  REGISTRY: ghcr.io
+
+
+jobs:
+  build:
+    runs-on: windows-2022
+    permissions:
+      contents: read
+      packages: write
+      # This is used to complete the identity challenge
+      # with sigstore/fulcio when running outside of PRs.
+      id-token: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Install the cosign tool except on PR
+      # https://github.com/sigstore/cosign-installer
+      - name: Install cosign
+        if: github.event_name != 'pull_request'
+        uses: sigstore/cosign-installer@6e04d228eb30da1757ee4e1dd75a0ec73a653e06 #v3.1.1
+        with:
+          cosign-release: 'v2.1.1'
+
+      # Set up BuildKit Docker container builder to be able to build
+      # multi-platform images and export cache
+      # https://github.com/docker/setup-buildx-action
+      #- name: Set up Docker Buildx
+      #  uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - run: docker build -t "${{ env.REGISTRY }}/${{ github.repository_owner }}/chocolatey:latest" chocolatey
+      - run: docker build -t "${{ env.REGISTRY }}/${{ github.repository_owner }}/rust-windows:latest" rust-windows 
+      - run: docker build -t "${{ env.REGISTRY }}/${{ github.repository_owner }}/rsxe-windows:latest" rsxe-windows 
+      - run: docker push "${{ env.REGISTRY }}/${{ github.repository_owner }}/rsxe-windows:latest"
+      - run: docker push "${{ env.REGISTRY }}/${{ github.repository_owner }}/rust-windows:latest"
+      - run: docker push "${{ env.REGISTRY }}/${{ github.repository_owner }}/chocolatey:latest"
+
diff --git a/custom/Dockerfile b/rsxe-windows/Dockerfile
similarity index 92%
rename from custom/Dockerfile
rename to rsxe-windows/Dockerfile
index 1257d31..faa2084 100644
--- a/custom/Dockerfile
+++ b/rsxe-windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust
+FROM ghcr.io/automesh-network/rust-windows:latest
 
 RUN choco install openssl git strawberryperl just -y
 
diff --git a/rust/Dockerfile b/rust-windows/Dockerfile
similarity index 85%
rename from rust/Dockerfile
rename to rust-windows/Dockerfile
index c7351ca..6d53e69 100644
--- a/rust/Dockerfile
+++ b/rust-windows/Dockerfile
@@ -1,4 +1,4 @@
-FROM chocolatey
+FROM ghcr.io/automesh-network/chocolatey:latest
 
 RUN choco install rustup.install -y
 RUN choco install visualstudio2022buildtools -y --package-parameters '--quiet --wait --norestart --add Microsoft.Component.MSBuild --add Microsoft.VisualStudio.Component.Windows11SDK.22621 --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64'