diff --git a/.github/workflows/ghrc-push-main.yml b/.github/workflows/ghrc-push-main.yml
index bd7d2c0c..4d3f6bd8 100644
--- a/.github/workflows/ghrc-push-main.yml
+++ b/.github/workflows/ghrc-push-main.yml
@@ -1,88 +1,88 @@
-# name: Publish docker image to ghcr (latest)
+name: Publish docker image to ghcr (latest)
 
-# env:
-#   IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/archgw
+env:
+  IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/archgw
 
-# on:
-#   push:
-#     branches: [main]
+on:
+  push:
+    branches: [main]
 
-# jobs:
-#   build-arm64:
-#     runs-on: [linux-arm64]
-#     permissions: { contents: read, packages: write }
-#     steps:
-#       - uses: actions/checkout@v4
-#       - uses: docker/login-action@v3
-#         with:
-#           registry: ghcr.io
-#           username: ${{ github.actor }}
-#           password: ${{ secrets.GITHUB_TOKEN }}
+jobs:
+  build-arm64:
+    runs-on: [linux-arm64]
+    permissions: { contents: read, packages: write }
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-#       - id: meta
-#         uses: docker/metadata-action@v5
-#         with:
-#           images: ${{ env.IMAGE_NAME }}
-#           tags: |
-#             type=raw,value=latest
+      - id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
 
-#       - name: Build and Push ARM64 Image
-#         uses: docker/build-push-action@v5
-#         with:
-#           context: .
-#           file: ./arch/Dockerfile
-#           platforms: linux/arm64
-#           push: true
-#           # produce ghcr.io/<owner>/archgw:latest-arm64
-#           tags: ${{ steps.meta.outputs.tags }}-arm64
+      - name: Build and Push ARM64 Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./arch/Dockerfile
+          platforms: linux/arm64
+          push: true
+          # produce ghcr.io/<owner>/archgw:latest-arm64
+          tags: ${{ steps.meta.outputs.tags }}-arm64
 
-#   build-amd64:
-#     runs-on: ubuntu-latest
-#     permissions: { contents: read, packages: write }
-#     steps:
-#       - uses: actions/checkout@v4
-#       - uses: docker/login-action@v3
-#         with:
-#           registry: ghcr.io
-#           username: ${{ github.actor }}
-#           password: ${{ secrets.GITHUB_TOKEN }}
+  build-amd64:
+    runs-on: ubuntu-latest
+    permissions: { contents: read, packages: write }
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-#       - id: meta
-#         uses: docker/metadata-action@v5
-#         with:
-#           images: ${{ env.IMAGE_NAME }}
-#           tags: |
-#             type=raw,value=latest
+      - id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
 
-#       - name: Build and Push AMD64 Image
-#         uses: docker/build-push-action@v5
-#         with:
-#           context: .
-#           file: ./arch/Dockerfile
-#           platforms: linux/amd64
-#           push: true
-#           tags: ${{ steps.meta.outputs.tags }}-amd64
+      - name: Build and Push AMD64 Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./arch/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}-amd64
 
-#   create-manifest:
-#     runs-on: ubuntu-latest
-#     needs: [build-arm64, build-amd64]
-#     permissions: { contents: read, packages: write }
-#     steps:
-#       - uses: docker/login-action@v3
-#         with:
-#           registry: ghcr.io
-#           username: ${{ github.actor }}
-#           password: ${{ secrets.GITHUB_TOKEN }}
+  create-manifest:
+    runs-on: ubuntu-latest
+    needs: [build-arm64, build-amd64]
+    permissions: { contents: read, packages: write }
+    steps:
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-#       - id: meta
-#         uses: docker/metadata-action@v5
-#         with:
-#           images: ${{ env.IMAGE_NAME }}
-#           tags: |
-#             type=raw,value=latest
+      - id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest
 
-#       - name: Create Multi-Arch Manifest
-#         run: |
-#           docker buildx imagetools create -t ${{ steps.meta.outputs.tags }} \
-#             ${{ env.IMAGE_NAME }}:latest-arm64 \
-#             ${{ env.IMAGE_NAME }}:latest-amd64
+      - name: Create Multi-Arch Manifest
+        run: |
+          docker buildx imagetools create -t ${{ steps.meta.outputs.tags }} \
+            ${{ env.IMAGE_NAME }}:latest-arm64 \
+            ${{ env.IMAGE_NAME }}:latest-amd64
diff --git a/.github/workflows/ghrc-push-release.yml b/.github/workflows/ghrc-push-release.yml
index 5a446519..35d5de92 100644
--- a/.github/workflows/ghrc-push-release.yml
+++ b/.github/workflows/ghrc-push-release.yml
@@ -1,87 +1,87 @@
-# name: release - publish docker image to ghcr (latest)
+name: release - publish docker image to ghcr (latest)
 
-# env:
-#   IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/archgw
+env:
+  IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/archgw
 
-# on:
-#   release:
-#     types: [published]
+on:
+  release:
+    types: [published]
 
-# jobs:
-#   build-arm64:
-#     runs-on: [linux-arm64]
-#     permissions: { contents: read, packages: write }
-#     steps:
-#       - uses: actions/checkout@v4
-#       - uses: docker/login-action@v3
-#         with:
-#           registry: ghcr.io
-#           username: ${{ github.actor }}
-#           password: ${{ secrets.GITHUB_TOKEN }}
+jobs:
+  build-arm64:
+    runs-on: [linux-arm64]
+    permissions: { contents: read, packages: write }
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-#       - id: meta
-#         uses: docker/metadata-action@v5
-#         with:
-#           images: ${{ env.IMAGE_NAME }}
-#           tags: |
-#             type=raw,value={{tag}}
+      - id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value={{tag}}
 
-#       - name: Build and Push ARM64 Image
-#         uses: docker/build-push-action@v5
-#         with:
-#           context: .
-#           file: ./arch/Dockerfile
-#           platforms: linux/arm64
-#           push: true
-#           tags: ${{ steps.meta.outputs.tags }}-arm64
+      - name: Build and Push ARM64 Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./arch/Dockerfile
+          platforms: linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}-arm64
 
-#   build-amd64:
-#     runs-on: ubuntu-latest
-#     permissions: { contents: read, packages: write }
-#     steps:
-#       - uses: actions/checkout@v4
-#       - uses: docker/login-action@v3
-#         with:
-#           registry: ghcr.io
-#           username: ${{ github.actor }}
-#           password: ${{ secrets.GITHUB_TOKEN }}
+  build-amd64:
+    runs-on: ubuntu-latest
+    permissions: { contents: read, packages: write }
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-#       - id: meta
-#         uses: docker/metadata-action@v5
-#         with:
-#           images: ${{ env.IMAGE_NAME }}
-#           tags: |
-#             type=raw,value={{tag}}
+      - id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value={{tag}}
 
-#       - name: Build and Push AMD64 Image
-#         uses: docker/build-push-action@v5
-#         with:
-#           context: .
-#           file: ./arch/Dockerfile
-#           platforms: linux/amd64
-#           push: true
-#           tags: ${{ steps.meta.outputs.tags }}-amd64
+      - name: Build and Push AMD64 Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./arch/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}-amd64
 
-#   create-manifest:
-#     runs-on: ubuntu-latest
-#     needs: [build-arm64, build-amd64]
-#     permissions: { contents: read, packages: write }
-#     steps:
-#       - uses: docker/login-action@v3
-#         with:
-#           registry: ghcr.io
-#           username: ${{ github.actor }}
-#           password: ${{ secrets.GITHUB_TOKEN }}
+  create-manifest:
+    runs-on: ubuntu-latest
+    needs: [build-arm64, build-amd64]
+    permissions: { contents: read, packages: write }
+    steps:
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-#       - id: meta
-#         uses: docker/metadata-action@v5
-#         with:
-#           images: ${{ env.IMAGE_NAME }}
-#           tags: |
-#             type=raw,value={{tag}}
+      - id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value={{tag}}
 
-#       - name: Create Multi-Arch Manifest
-#         run: |
-#           docker buildx imagetools create -t ${{ steps.meta.outputs.tags }} \
-#             ${{ steps.meta.outputs.tags }}-arm64 \
-#             ${{ steps.meta.outputs.tags }}-amd64
+      - name: Create Multi-Arch Manifest
+        run: |
+          docker buildx imagetools create -t ${{ steps.meta.outputs.tags }} \
+            ${{ steps.meta.outputs.tags }}-arm64 \
+            ${{ steps.meta.outputs.tags }}-amd64