diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6136d606c9f1275da3a045afb7a0ef3e5b5f06a7..c154abca1e0e813fd83e27ff2fe9a022084d2251 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,13 +45,13 @@ stages:
   except:
     - assets
 
-deploy-master:
+deploy-main:
   <<: *deploy_template
   environment:
-    name: master
+    name: main
     url: https://${PRODUCTION_HOST}
   only:
-    - master
+    - main
 
 deploy-develop:
   <<: *deploy_template
@@ -64,5 +64,5 @@ deploy-develop:
 "Create Badge":
   stage: badges
   script:
-    - last_master_deploy=$(git --no-pager log -1 --date=format:"%Y/%m/%d-%T" --format="%ad" origin/master)
+    - last_master_deploy=$(git --no-pager log -1 --date=format:"%Y/%m/%d-%T" --format="%ad" origin/main)
     - anybadge -l "Last Production Deployment" -v $last_master_deploy -f lastProductionDeployment.svg -c orange
diff --git a/.gitlab-ci/deployer/servers.yml b/.gitlab-ci/deployer/servers.yml
index 3afe40dba4211d69f229edda40cd088a92e5490b..75184589c4091a618b12ac0227c95d2184728031 100644
--- a/.gitlab-ci/deployer/servers.yml
+++ b/.gitlab-ci/deployer/servers.yml
@@ -1,5 +1,5 @@
-master:
-    stage: master
+main:
+    stage: main
     hostname: typo3.org
     user: t3o-prod
     writable_mode: chmod