diff --git a/.github/workflows/docker-hub-latest.yml b/.github/workflows/docker-hub-develop.yml
similarity index 74%
rename from .github/workflows/docker-hub-latest.yml
rename to .github/workflows/docker-hub-develop.yml
index 6a8845bb..a1faa853 100644
--- a/.github/workflows/docker-hub-latest.yml
+++ b/.github/workflows/docker-hub-develop.yml
@@ -1,12 +1,14 @@
 # Copied from https://github.com/matrix-org/matrix-bifrost/blob/develop/.github/workflows/docker-hub-latest.yml
 
-name: "Docker Hub - Latest"
+name: "Docker Hub - Develop"
 
 on:
   push:
+    branches:
+      - main
 
 env:
-  DOCKER_NAMESPACE: matrixdotorg
+  DOCKER_NAMESPACE: gnuxie
   PLATFORMS: linux/amd64
   # Only push if this is main, otherwise we just want to build
   PUSH: ${{ github.ref == 'refs/heads/main' }}
@@ -20,8 +22,8 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build image
         uses: docker/build-push-action@v2
@@ -31,4 +33,4 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           push: ${{ env.PUSH }}
           tags: |
-            ${{ env.DOCKER_NAMESPACE }}/mjolnir:latest
+            ${{ env.DOCKER_NAMESPACE }}/draupnir:develop
diff --git a/.github/workflows/docker-hub-release.yml b/.github/workflows/docker-hub-release.yml
index 7df6017e..e9d38317 100644
--- a/.github/workflows/docker-hub-release.yml
+++ b/.github/workflows/docker-hub-release.yml
@@ -7,7 +7,7 @@ on:
     types: [published]
 
 env:
-  DOCKER_NAMESPACE: matrixdotorg
+  DOCKER_NAMESPACE: gnuxie
   PLATFORMS: linux/amd64
 
 jobs:
@@ -21,8 +21,8 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build image
         uses: docker/build-push-action@v2
@@ -32,4 +32,5 @@ jobs:
           platforms: ${{ env.PLATFORMS }}
           push: true
           tags: |
-            ${{ env.DOCKER_NAMESPACE }}/mjolnir:${{ env.RELEASE_VERSION }}
+            ${{ env.DOCKER_NAMESPACE }}/draupnir:${{ env.RELEASE_VERSION }}
+            ${{ env.DOCKER_NAMESPACE }}/draupnir:latest
diff --git a/.github/workflows/mjolnir.yml b/.github/workflows/mjolnir.yml
index bb579618..ede287ce 100644
--- a/.github/workflows/mjolnir.yml
+++ b/.github/workflows/mjolnir.yml
@@ -1,4 +1,4 @@
-name: Mjolnir
+name: Tests
 
 on:
   push: