diff --git a/ci/pipeline-haproxy-maintenance.yml b/ci/pipeline-haproxy-maintenance.yml
index 08494d8f..b4f1d6b1 100644
--- a/ci/pipeline-haproxy-maintenance.yml
+++ b/ci/pipeline-haproxy-maintenance.yml
@@ -369,7 +369,7 @@ jobs:
             REPO_OUT:     pushme
             NOTIFICATION_OUT: notifications
             BRANCH:        maintenance
-            GITHUB_OWNER:  b1tamara
+            GITHUB_OWNER:  cloudfoundry
 
             GCP_SERVICE_KEY: ((gcp.service_key))
 
@@ -426,7 +426,7 @@ jobs:
               params:
                 REPO_ROOT: git-previous-release
                 PR_BASE: maintenance
-                PR_ORG: b1tamara
+                PR_ORG: cloudfoundry
                 PR_LABEL: run-ci
 
                 GCP_SERVICE_KEY: ((gcp.service_key))
@@ -461,7 +461,7 @@ resources:
   - name: git-previous-release
     type: git
     source:
-      uri:         git@github.com:b1tamara/haproxy-boshrelease.git
+      uri:         git@github.com:cloudfoundry/haproxy-boshrelease.git
       branch:      maintenance
       private_key: ((github.private_key))
 
@@ -469,7 +469,7 @@ resources:
     type: pull-request
     source:
       access_token: ((github.access_token))
-      repository:   b1tamara/haproxy-boshrelease
+      repository:   cloudfoundry/haproxy-boshrelease
       base_branch:  maintenance
       labels:       [run-ci]
 
@@ -505,7 +505,7 @@ resources:
   - name: github
     type: github-release-alt
     source:
-      user:         b1tamara
+      user:         cloudfoundry
       repository:   haproxy-boshrelease
       access_token: ((github.access_token))