diff --git a/jjb/oam/oam.yaml b/jjb/oam/oam.yaml
index 8e40a7c..1a9762c 100644
--- a/jjb/oam/oam.yaml
+++ b/jjb/oam/oam.yaml
@@ -65,7 +65,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-sonar
 
@@ -104,7 +104,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-sonar
 
diff --git a/jjb/scp-oam-modeling/scp-oam-modeling.yaml b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
index cf9f392..a88461e 100644
--- a/jjb/scp-oam-modeling/scp-oam-modeling.yaml
+++ b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
@@ -47,7 +47,7 @@
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-sonar