diff --git a/.github/workflows/image-release.yml b/.github/workflows/image-release.yml
index 7ebad66..04b3be2 100644
--- a/.github/workflows/image-release.yml
+++ b/.github/workflows/image-release.yml
@@ -32,8 +32,11 @@ on:
 jobs:
 
   release:
-    runs-on: [self-hosted, ARM64, stable]
+    runs-on: ubuntu-latest
     environment: DOCKER_HUB
+    permissions:
+      contents: read
+      packages: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -63,11 +66,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Login to Registry
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.registry-username }}
-          password: ${{ secrets.registry-password }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1bcd006..982dce6 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -9,9 +9,11 @@ on:
 jobs:
 
   release:
-    runs-on: [self-hosted, ARM64, stable]
+    runs-on: ubuntu-latest
     environment: DOCKER_HUB
-
+    permissions:
+      contents: read
+      packages: write
     steps:
 
       - name: Checkout
@@ -38,11 +40,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2.4.1
 
-      - name: Login to DockerHub
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         uses: docker/build-push-action@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4e02b3f..b4ab607 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,12 +2,12 @@ name: Release new Docker image
 
 on:
   push:
-    tags:
-      - 'v*'
+    branches:
+      - newapproach
   workflow_dispatch:
 
 env:
-  BASE_IMAGE_NAME: plone/frontend
+  BASE_IMAGE_NAME: kitconcept/frontend
   PLATFORMS: linux/amd64,linux/arm64
   IS_LATEST: false