diff --git a/Jenkinsfile b/Jenkinsfile
index 30cdc45..8bbbeca 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@
 
 lintOutTrimmed = ""
 
-node ('master') {
+node ('server') {
   gerritReview labels: ['Code-Style': 0]
 
   stage('YAML lint') {
diff --git a/jenkins-docker/Makefile b/jenkins-docker/Makefile
index 0cdf3c3..f8539ef 100644
--- a/jenkins-docker/Makefile
+++ b/jenkins-docker/Makefile
@@ -1,5 +1,5 @@
 AGENT_DIRS ?= agent-debian agent-chrome agent-node-wct agent-bazel-nocache agent-bazel agent-bazel-docker agent-sbt agent-mvn agent-release agent-python3 agent-jekyll agent-aws
-ALL_DIRS ?= master bazel-cache $(AGENT_DIRS)
+ALL_DIRS ?= server bazel-cache $(AGENT_DIRS)
 NO_CACHE ?= true
 
 default: build
@@ -11,5 +11,5 @@
 	for dir in $(AGENT_DIRS); do (make NO_CACHE=$(NO_CACHE) -C $$dir build publish) || exit 1; done
 
 start stop restart:
-	make -C master $@
+	make -C server $@
 
diff --git a/jenkins-docker/agent-debian/Makefile b/jenkins-docker/agent-debian/Makefile
index c795c63..164b36b 100644
--- a/jenkins-docker/agent-debian/Makefile
+++ b/jenkins-docker/agent-debian/Makefile
@@ -14,7 +14,7 @@
 publish:
 	docker push ${IMAGE}:$(DEBIAN_VER)
 
-id_rsa.pub: ../master/id_rsa.pub
+id_rsa.pub: ../server/id_rsa.pub
 	cp $? $@
 
 clean:
diff --git a/jenkins-docker/master/Dockerfile b/jenkins-docker/server/Dockerfile
similarity index 100%
rename from jenkins-docker/master/Dockerfile
rename to jenkins-docker/server/Dockerfile
diff --git a/jenkins-docker/master/Makefile b/jenkins-docker/server/Makefile
similarity index 100%
rename from jenkins-docker/master/Makefile
rename to jenkins-docker/server/Makefile
diff --git a/jenkins-docker/master/config.sh b/jenkins-docker/server/config.sh
similarity index 100%
rename from jenkins-docker/master/config.sh
rename to jenkins-docker/server/config.sh
diff --git a/jenkins-docker/master/config.xml b/jenkins-docker/server/config.xml
similarity index 99%
rename from jenkins-docker/master/config.xml
rename to jenkins-docker/server/config.xml
index cd797e3..3911ec0 100644
--- a/jenkins-docker/master/config.xml
+++ b/jenkins-docker/server/config.xml
@@ -319,7 +319,7 @@
   </views>
   <primaryView>All</primaryView>
   <slaveAgentPort>0</slaveAgentPort>
-  <label>master</label>
+  <label>server</label>
   <nodeProperties>
     <hudson.slaves.EnvironmentVariablesNodeProperty>
       <envVars serialization="custom">
diff --git a/jenkins-docker/master/edit-config.xslt b/jenkins-docker/server/edit-config.xslt
similarity index 100%
rename from jenkins-docker/master/edit-config.xslt
rename to jenkins-docker/server/edit-config.xslt
diff --git a/jenkins-docker/master/gerrit-ci-scripts-manual.xml b/jenkins-docker/server/gerrit-ci-scripts-manual.xml
similarity index 98%
rename from jenkins-docker/master/gerrit-ci-scripts-manual.xml
rename to jenkins-docker/server/gerrit-ci-scripts-manual.xml
index afebc71..63acb7d 100644
--- a/jenkins-docker/master/gerrit-ci-scripts-manual.xml
+++ b/jenkins-docker/server/gerrit-ci-scripts-manual.xml
@@ -42,7 +42,7 @@
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>master</assignedNode>
+  <assignedNode>server</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/jenkins-docker/master/gerrit-ci-scripts.xml b/jenkins-docker/server/gerrit-ci-scripts.xml
similarity index 97%
rename from jenkins-docker/master/gerrit-ci-scripts.xml
rename to jenkins-docker/server/gerrit-ci-scripts.xml
index 1b8e018..40efe13 100644
--- a/jenkins-docker/master/gerrit-ci-scripts.xml
+++ b/jenkins-docker/server/gerrit-ci-scripts.xml
@@ -30,7 +30,7 @@
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>master</assignedNode>
+  <assignedNode>server</assignedNode>
   <canRoam>false</canRoam>
   <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
diff --git a/jenkins-docker/master/gitconfig b/jenkins-docker/server/gitconfig
similarity index 100%
rename from jenkins-docker/master/gitconfig
rename to jenkins-docker/server/gitconfig
diff --git a/jenkins-docker/master/jenkins.model.JenkinsLocationConfiguration.xml b/jenkins-docker/server/jenkins.model.JenkinsLocationConfiguration.xml
similarity index 100%
rename from jenkins-docker/master/jenkins.model.JenkinsLocationConfiguration.xml
rename to jenkins-docker/server/jenkins.model.JenkinsLocationConfiguration.xml
diff --git a/jenkins-docker/master/jenkins.plugins.logstash.LogstashInstallation.xml b/jenkins-docker/server/jenkins.plugins.logstash.LogstashInstallation.xml
similarity index 100%
rename from jenkins-docker/master/jenkins.plugins.logstash.LogstashInstallation.xml
rename to jenkins-docker/server/jenkins.plugins.logstash.LogstashInstallation.xml
diff --git a/jenkins-docker/master/jenkins.sh b/jenkins-docker/server/jenkins.sh
similarity index 100%
rename from jenkins-docker/master/jenkins.sh
rename to jenkins-docker/server/jenkins.sh
diff --git a/jenkins-docker/master/jenkins_jobs.ini b/jenkins-docker/server/jenkins_jobs.ini
similarity index 100%
rename from jenkins-docker/master/jenkins_jobs.ini
rename to jenkins-docker/server/jenkins_jobs.ini
diff --git a/jenkins-docker/master/number-executors.groovy b/jenkins-docker/server/number-executors.groovy
similarity index 92%
rename from jenkins-docker/master/number-executors.groovy
rename to jenkins-docker/server/number-executors.groovy
index 0a9c016..3df6465 100644
--- a/jenkins-docker/master/number-executors.groovy
+++ b/jenkins-docker/server/number-executors.groovy
@@ -18,7 +18,7 @@
 
 Thread.start {
       sleep 10000
-      println "--> setting maximum number of executors on master"
+      println "--> setting maximum number of executors on server"
       Jenkins.instance.setNumExecutors(10)
       Jenkins.instance.reload()
 }
diff --git a/jenkins-docker/master/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml b/jenkins-docker/server/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
similarity index 100%
rename from jenkins-docker/master/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
rename to jenkins-docker/server/org.jenkinsci.plugins.workflow.libs.GlobalLibraries.xml
diff --git a/jenkins-docker/master/plugins.txt b/jenkins-docker/server/plugins.txt
similarity index 100%
rename from jenkins-docker/master/plugins.txt
rename to jenkins-docker/server/plugins.txt
diff --git a/jenkins-docker/master/setCredentials.groovy b/jenkins-docker/server/setCredentials.groovy
similarity index 100%
rename from jenkins-docker/master/setCredentials.groovy
rename to jenkins-docker/server/setCredentials.groovy
diff --git a/jenkins/gerrit-bazel-plugin-template.yaml b/jenkins/gerrit-bazel-plugin-template.yaml
index 20b610a..82787c5 100644
--- a/jenkins/gerrit-bazel-plugin-template.yaml
+++ b/jenkins/gerrit-bazel-plugin-template.yaml
@@ -26,7 +26,7 @@
 
 - defaults:
     name: verifier-template-bazel
-    node: master
+    node: server
     days-to-keep: 90
     number-to-keep: 500
     prune-dead-branches: true
diff --git a/jenkins/gerrit-ci-scripts.yaml b/jenkins/gerrit-ci-scripts.yaml
index 3c815bc..315a5d8 100644
--- a/jenkins/gerrit-ci-scripts.yaml
+++ b/jenkins/gerrit-ci-scripts.yaml
@@ -1,7 +1,7 @@
 - job:
     name: gerrit-ci-scripts
     description: Gerrit Jenkins Job Builder Scripts
-    node: master
+    node: server
     scm:
       - git:
           url: https://gerrit.googlesource.com/a/gerrit-ci-scripts
@@ -18,7 +18,7 @@
 - job:
     name: gerrit-ci-scripts-docker
     description: Gerrit Jenkins Job Builder Docker images
-    node: master
+    node: server
     scm:
       - git:
           url: https://gerrit.googlesource.com/a/gerrit-ci-scripts
@@ -39,7 +39,7 @@
 - job:
     name: gerrit-ci-scripts-manual
     description: Manually rebuild gerrit-ci-scripts from a specific Change ID and revision
-    node: master
+    node: server
     parameters:
       - string:
           name: CHANGE_NUMBER
@@ -88,7 +88,7 @@
     name: gerrit-ci-scripts-pipeline
     description: Multi-branch pipeline to validate Gerrit's Jenkins Job Builder Scripts
     project-type: multibranch
-    node: master
+    node: server
     scm:
       - gerrit:
           url: https://gerrit-review.googlesource.com/a/gerrit-ci-scripts
diff --git a/jenkins/gerrit-verifier.yaml b/jenkins/gerrit-verifier.yaml
index 75cc7a8..0eca620 100644
--- a/jenkins/gerrit-verifier.yaml
+++ b/jenkins/gerrit-verifier.yaml
@@ -180,7 +180,7 @@
     name: 'Gerrit-verifier-pipeline'
     description: Multi-branch pipeline to validate Gerrit
     project-type: multibranch
-    node: master
+    node: server
     days-to-keep: 90
     prune-dead-branches: true
     scm:
diff --git a/vars/gerritPipeline.groovy b/vars/gerritPipeline.groovy
index c062c33..b1d9c74 100644
--- a/vars/gerritPipeline.groovy
+++ b/vars/gerritPipeline.groovy
@@ -23,7 +23,7 @@
 import groovy.json.JsonOutput
 
 def call(Map parm = [:]) {
-    node ('master') {
+    node ('server') {
 
         if (hasChangeNumber()) {
             stage('Preparing'){