diff --git a/03_ocp_repo_sync.sh b/03_ocp_repo_sync.sh
index fca441fc8..64bb5ca5b 100755
--- a/03_ocp_repo_sync.sh
+++ b/03_ocp_repo_sync.sh
@@ -36,12 +36,7 @@ make install
 popd
 
 # Install baremetal-operator
-sync_repo_and_patch github.com/metalkube/baremetal-operator https://github.com/metalkube/baremetal-operator.git
-# FIXME(dhellmann): Use the pre-rename version of the operator until
-# this repository is ready for the renamed version.
-pushd $GOPATH/src/github.com/metalkube/baremetal-operator
-git checkout origin/metalkube
-popd
+sync_repo_and_patch github.com/metal3-io/baremetal-operator https://github.com/metal3-io/baremetal-operator.git
 
 # Install rook repository
 sync_repo_and_patch github.com/rook/rook https://github.com/rook/rook.git
diff --git a/08_deploy_bmo.sh b/08_deploy_bmo.sh
index 5ff9252fa..a03cabcd7 100755
--- a/08_deploy_bmo.sh
+++ b/08_deploy_bmo.sh
@@ -7,19 +7,15 @@ source logging.sh
 eval "$(go env)"
 
 # Get the latest bits for baremetal-operator
-export BMOPATH="$GOPATH/src/github.com/metalkube/baremetal-operator"
+export BMOPATH="$GOPATH/src/github.com/metal3-io/baremetal-operator"
 
 # Make a local copy of the baremetal-operator code to make changes
 cp -r $BMOPATH/deploy ocp/.
 sed -i 's/namespace: .*/namespace: openshift-machine-api/g' ocp/deploy/role_binding.yaml
-# FIXME(dhellmann): Use the pre-rename operator until this repo
-# works with the renamed version.
-# - https://github.com/openshift-metal3/dev-scripts/issues/548
-sed -i 's|image: quay.io/metalkube/baremetal-operator$|image: quay.io/metalkube/baremetal-operator:metalkube|' ocp/deploy/operator.yaml
 
 # Start deploying on the new cluster
 oc --config ocp/auth/kubeconfig apply -f ocp/deploy/service_account.yaml --namespace=openshift-machine-api
 oc --config ocp/auth/kubeconfig apply -f ocp/deploy/role.yaml --namespace=openshift-machine-api
 oc --config ocp/auth/kubeconfig apply -f ocp/deploy/role_binding.yaml
-oc --config ocp/auth/kubeconfig apply -f ocp/deploy/crds/metalkube_v1alpha1_baremetalhost_crd.yaml
+oc --config ocp/auth/kubeconfig apply -f ocp/deploy/crds/metal3_v1alpha1_baremetalhost_crd.yaml
 oc --config ocp/auth/kubeconfig apply -f ocp/deploy/operator.yaml --namespace=openshift-machine-api
diff --git a/make-bm-worker/main.go b/make-bm-worker/main.go
index 6d7de5c6f..6a5ebcd81 100644
--- a/make-bm-worker/main.go
+++ b/make-bm-worker/main.go
@@ -25,7 +25,7 @@ data:
   password: {{ .EncodedPassword }}
 
 ---
-apiVersion: metalkube.org/v1alpha1
+apiVersion: metal3.io/v1alpha1
 kind: BareMetalHost
 metadata:
   name: {{ .Name }}