diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48e4b3d..c72d309 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -306,19 +306,19 @@ jobs:
 
       - name: Publish Artifacts to S3 and Docker Hub
         run: make -j2 publish BRANCH_NAME=${GITHUB_REF##*/}
-        if: env.AWS_USR != '' && env.DOCKER_USR != ''
+        if: env.DOCKER_USR != ''
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
+          # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
+          # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
           GIT_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCS_GIT_USR: ${{ secrets.UPBOUND_BOT_GITHUB_USR }}
-          DOCS_GIT_PSW: ${{ secrets.UPBOUND_BOT_GITHUB_PSW }}
+          # DOCS_GIT_USR: ${{ secrets.UPBOUND_BOT_GITHUB_USR }}
+          # DOCS_GIT_PSW: ${{ secrets.UPBOUND_BOT_GITHUB_PSW }}
 
       - name: Promote Artifacts in S3 and Docker Hub
-        if: github.ref == 'refs/heads/main' && env.AWS_USR != '' && env.DOCKER_USR != ''
+        if: github.ref == 'refs/heads/main' && env.DOCKER_USR != ''
         run: make -j2 promote
         env:
           BRANCH_NAME: main
           CHANNEL: master
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
+          # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
+          # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml
index c5caf54..d0c8445 100644
--- a/.github/workflows/promote.yml
+++ b/.github/workflows/promote.yml
@@ -16,7 +16,7 @@ env:
   # a step 'if env.AWS_USR' != ""', so we copy these to succinctly test whether
   # credentials have been provided before trying to run steps that need them.
   DOCKER_USR: ${{ secrets.DOCKER_USR }}
-  AWS_USR: ${{ secrets.AWS_USR }}
+  # AWS_USR: ${{ secrets.AWS_USR }}
 
 jobs:
   promote-artifacts:
@@ -39,10 +39,10 @@ jobs:
           password: ${{ secrets.DOCKER_PSW }}
 
       - name: Promote Artifacts in S3 and Docker Hub
-        if: env.AWS_USR != '' && env.DOCKER_USR != ''
+        if: env.DOCKER_USR != ''
         run: make -j2 promote BRANCH_NAME=${GITHUB_REF##*/}
         env:
           VERSION: ${{ github.event.inputs.version }}
           CHANNEL: ${{ github.event.inputs.channel }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
+          # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_USR }}
+          # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PSW }}
diff --git a/Makefile b/Makefile
index 843a0fa..e919c58 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ KIND_NODE_IMAGE_TAG ?= v1.23.4
 -include build/makelib/k8s_tools.mk
 
 # Setup Images
-DOCKER_REGISTRY ?= crossplane
+DOCKER_REGISTRY ?= shrox
 IMAGES = $(PROJECT_NAME) $(PROJECT_NAME)-controller
 -include build/makelib/image.mk
 
diff --git a/package/crossplane.yaml b/package/crossplane.yaml
index 9508e60..b4ee118 100644
--- a/package/crossplane.yaml
+++ b/package/crossplane.yaml
@@ -3,7 +3,7 @@ kind: Provider
 metadata:
   name: provider-redhat
   annotations:
-    meta.crossplane.io/maintainer: Crossplane Maintainers <info@crossplane.io>
+    meta.crossplane.io/maintainer: Stephan Heßelmann <stephan@stehessel.de>
     meta.crossplane.io/source: github.com/stehessel/provider-redhat
     meta.crossplane.io/license: Apache-2.0
     meta.crossplane.io/description: |