diff --git a/jjb/airship/job_ipa_image_building.yml b/jjb/airship/job_ipa_image_building.yml
index 74b5728..98ed418 100644
--- a/jjb/airship/job_ipa_image_building.yml
+++ b/jjb/airship/job_ipa_image_building.yml
@@ -40,23 +40,47 @@
     - string:
         name: IRONIC_IMAGE_REPO_COMMIT
         default: 'HEAD'
-        description: 'Ironic Image repo commit hash to build'
+        description: 'Ironic Image repository commit hash to build'
     - string:
         name: IRONIC_IMAGE_BRANCH
         default: 'master'
-        description: 'Ironic image repo branch to build'
+        description: 'Ironic image repository branch to build'
     - string:
         name: IRONIC_INSPECTOR_REFSPEC
         default: ''
         description: 'Gerrit refspec of the patch we want to test. Example: refs/changes/84/800084/22'
     - string:
-        name: IPA_REPO_COMMIT
+        name: IPA_COMMIT
         default: 'HEAD'
-        description: 'Ironic Python Agent repo commit hash to build'
+        description: 'Ironic Python Agent repository commit hash to build'
     - string:
         name: IPA_BRANCH
         default: 'master'
-        description: 'Ironic Python Agent repo branch to build'
+        description: 'Ironic Python Agent repository branch to build'
+    - string:
+        name: BMO_COMMIT
+        default: 'HEAD'
+        description: 'Bare Metal Operator repository commit hash to build'
+    - string:
+        name: BMO_BRANCH
+        default: 'master'
+        description: 'Bare Metal Operator repository branch to build'
+    - string:
+        name: IPA_BUILDER_BRANCH
+        default: 'master'
+        description: 'Ironic Python Agent builder repository tool branch'
+    - string:
+        name: IPA_BUILDER_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Python Agent builder repository tool commit'
+    - string:
+        name: METAL3_DEV_ENV_BRANCH
+        default: 'master'
+        description: 'Metal3 dev env repository branch'
+    - string:
+        name: METAL3_DEV_ENV_COMMIT
+        default: 'HEAD'
+        description: 'Metal3 dev env repository commit'
     - string:
         name: STAGING
         default: 'true'
diff --git a/jjb/airship/job_ipa_image_building_test.yml b/jjb/airship/job_ipa_image_building_test.yml
index 0e539c6..a16ec00 100644
--- a/jjb/airship/job_ipa_image_building_test.yml
+++ b/jjb/airship/job_ipa_image_building_test.yml
@@ -34,6 +34,54 @@
     concurrent: True
     parameters:
     - string:
+        name: IRONIC_REFSPEC
+        default: ''
+        description: 'Gerrit refspec of the patch we want to test. Example: refs/changes/84/800084/22'
+    - string:
+        name: IRONIC_IMAGE_REPO_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Image repository commit hash to build'
+    - string:
+        name: IRONIC_IMAGE_BRANCH
+        default: 'master'
+        description: 'Ironic image repository branch to build'
+    - string:
+        name: IRONIC_INSPECTOR_REFSPEC
+        default: ''
+        description: 'Gerrit refspec of the patch we want to test. Example: refs/changes/84/800084/22'
+    - string:
+        name: IPA_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Python Agent repository commit hash to build'
+    - string:
+        name: IPA_BRANCH
+        default: 'master'
+        description: 'Ironic Python Agent repository branch to build'
+    - string:
+        name: BMO_COMMIT
+        default: 'HEAD'
+        description: 'Bare Metal Operator repository commit hash to build'
+    - string:
+        name: BMO_BRANCH
+        default: 'master'
+        description: 'Bare Metal Operator repository branch to build'
+    - string:
+        name: IPA_BUILDER_BRANCH
+        default: 'master'
+        description: 'Ironic Python Agent builder repository tool branch'
+    - string:
+        name: IPA_BUILDER_COMMIT
+        default: 'HEAD'
+        description: 'Ironic Python Agent builder repository tool commit'
+    - string:
+        name: METAL3_DEV_ENV_BRANCH
+        default: 'master'
+        description: 'Metal3 dev env repository branch'
+    - string:
+        name: METAL3_DEV_ENV_COMMIT
+        default: 'HEAD'
+        description: 'Metal3 dev env repository commit'
+    - string:
         name: PROJECT_REPO_ORG
         default: '{repo[org]}'
         description: 'Project github repo org name'