diff --git a/README.md b/README.md
index 4b07903..8e53e34 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ This might be needed in both the `ostreeRepo` and the `ostreeImage` feature.
 
 - `REMOTE_URL`: Hostname to use as OSTree remote, default value is `http://ostree.gardenlinux.io`
 - `OS_NAME`: OS Name (Stateroot) used for OSTree, default value is either `debian` or `gardenlinux`, change this if you want to build a custom OS
-- `REMOTE_NAME`: Name for the OSTree remote (similar to remote 'origin' in git), default value is either `debian` or `gardenlinux`, change this if you want to build a custom OS
+- `REMOTE_NAME`: Name for the OSTree remote (similar to remote 'origin' in git), default value is `main`
 
 ### Debian
 
diff --git a/debian/features/ostreeImage/image.ostree.raw b/debian/features/ostreeImage/image.ostree.raw
index 6841820..d798a06 100755
--- a/debian/features/ostreeImage/image.ostree.raw
+++ b/debian/features/ostreeImage/image.ostree.raw
@@ -4,7 +4,7 @@ set -euxo pipefail
 
 REMOTE_URL=$([ -f /builder/features/ostreeImage/REMOTE_URL ] && cat /builder/features/ostreeImage/REMOTE_URL || echo http://ostree.gardenlinux.io)
 OS_NAME=$([ -f /builder/features/ostreeImage/OS_NAME ] && cat /builder/features/ostreeImage/OS_NAME || echo debian)
-REMOTE_NAME=$([ -f /builder/features/ostreeImage/REMOTE_NAME ] && cat /builder/features/ostreeImage/REMOTE_NAME || echo debian)
+REMOTE_NAME=$([ -f /builder/features/ostreeImage/REMOTE_NAME ] && cat /builder/features/ostreeImage/REMOTE_NAME || echo main)
 REMOTE_ARCHIVE_NAME=ostree-${OS_NAME}-repo-${BUILDER_ARCH}.tar.gz
 LOCAL_ARCHIVE_PATH=/builder/features/ostreeImage/$REMOTE_ARCHIVE_NAME
 REMOTE_REPO_PATH=${OS_NAME}-repo-${BUILDER_ARCH}
diff --git a/debian/features/ostreeRepo/exec.late b/debian/features/ostreeRepo/exec.late
index a590d3c..f7e54cf 100755
--- a/debian/features/ostreeRepo/exec.late
+++ b/debian/features/ostreeRepo/exec.late
@@ -50,7 +50,7 @@ echo Performing OSTree upgrade
 # Workaround for missing remote in origin file
 find /ostree/deploy/*/deploy/*.origin | while read origin_file
 do
-  sudo sed -i 's#refspec=debian#refspec=origin:debian#g' $origin_file
+  sudo sed -i 's#refspec=debian#refspec=main:debian#g' $origin_file
 done
 
 sudo ostree admin upgrade
diff --git a/debian/features/ostreeRepo/image.ostreeRepo.tar.gz b/debian/features/ostreeRepo/image.ostreeRepo.tar.gz
index 58deade..78096bf 100755
--- a/debian/features/ostreeRepo/image.ostreeRepo.tar.gz
+++ b/debian/features/ostreeRepo/image.ostreeRepo.tar.gz
@@ -4,7 +4,7 @@ set -euxo pipefail
 
 REMOTE_URL=$([ -f /builder/features/ostreeRepo/REMOTE_URL ] && cat /builder/features/ostreeRepo/REMOTE_URL || echo http://ostree.gardenlinux.io)
 OS_NAME=$([ -f /builder/features/ostreeRepo/OS_NAME ] && cat /builder/features/ostreeRepo/OS_NAME || echo debian)
-REMOTE_NAME=$([ -f /builder/features/ostreeRepo/REMOTE_NAME ] && cat /builder/features/ostreeRepo/REMOTE_NAME || echo debian)
+REMOTE_NAME=$([ -f /builder/features/ostreeRepo/REMOTE_NAME ] && cat /builder/features/ostreeRepo/REMOTE_NAME || echo main)
 REMOTE_ARCHIVE_NAME=ostree-${OS_NAME}-repo-${BUILDER_ARCH}.tar.gz
 LOCAL_ARCHIVE_PATH=/builder/features/ostreeRepo/$REMOTE_ARCHIVE_NAME
 REMOTE_REPO_PATH=${OS_NAME}-repo-${BUILDER_ARCH}
diff --git a/gardenlinux/features/ostreeRepo/exec.late b/gardenlinux/features/ostreeRepo/exec.late
index 134179a..9b08f4d 100755
--- a/gardenlinux/features/ostreeRepo/exec.late
+++ b/gardenlinux/features/ostreeRepo/exec.late
@@ -53,7 +53,7 @@ ostree log gardenlinux/today/arm64
 # Workaround for missing remote in origin file
 find /ostree/deploy/*/deploy/*.origin | while read origin_file
 do
-  sudo sed -i 's#refspec=gardenlinux#refspec=origin:gardenlinux#g' $origin_file
+  sudo sed -i 's#refspec=gardenlinux#refspec=main:gardenlinux#g' $origin_file
 done
 
 sudo ostree admin upgrade
diff --git a/gardenlinux/features/ostreeRepo/image.ostreeRepo.tar.gz b/gardenlinux/features/ostreeRepo/image.ostreeRepo.tar.gz
index 716cf1e..81c9ae6 100755
--- a/gardenlinux/features/ostreeRepo/image.ostreeRepo.tar.gz
+++ b/gardenlinux/features/ostreeRepo/image.ostreeRepo.tar.gz
@@ -7,7 +7,7 @@ set -euxo pipefail
 BUILD_VARIANT=$([ -f /builder/features/ostreeRepo/BUILD_VARIANT ] && cat /builder/features/ostreeRepo/BUILD_VARIANT || echo kvm)
 REMOTE_URL=$([ -f /builder/features/ostreeRepo/REMOTE_URL ] && cat /builder/features/ostreeRepo/REMOTE_URL || echo http://ostree.gardenlinux.io)
 OS_NAME=$([ -f /builder/features/ostreeRepo/OS_NAME ] && cat /builder/features/ostreeRepo/OS_NAME || echo gardenlinux)
-REMOTE_NAME=$([ -f /builder/features/ostreeRepo/REMOTE_NAME ] && cat /builder/features/ostreeRepo/REMOTE_NAME || echo gardenlinux)
+REMOTE_NAME=$([ -f /builder/features/ostreeRepo/REMOTE_NAME ] && cat /builder/features/ostreeRepo/REMOTE_NAME || echo main)
 REMOTE_ARCHIVE_NAME=ostree-${OS_NAME}-repo-${BUILD_VARIANT}-${BUILDER_ARCH}.tar.gz
 LOCAL_ARCHIVE_PATH=/builder/features/ostreeRepo/$REMOTE_ARCHIVE_NAME
 REMOTE_REPO_PATH=${OS_NAME}-repo-${BUILD_VARIANT}-${BUILDER_ARCH}