diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index e759687bc..330ce6ea6 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -278,11 +278,28 @@
       value: openshift-worker-node@acs-team-temp-dev.iam.gserviceaccount.com
       kind: optional
 
+    - name: cloud-provider
+      description: Cloud provider
+      value: gcp
+      kind: optional
+      help: gcp or aws
+
+    - name: base-domain
+      description: For gcp use ocp.infra.rox.systems or for aws use aws.dev.rox.systems
+      value: ocp.infra.rox.systems
+      kind: optional
+
     - name: region
-      description: Google Cloud region to deploy infrastructure into.
+      description: Cloud region to deploy infrastructure into (empty for default).
       value: us-east1
       kind: optional
 
+    - name: network-stack
+      description: Network stack
+      value: ipv4
+      help: Network stack ipv4(default), dual/dual-ipv4-primary, dual-ipv6-primary
+      kind: optional
+
     - name: fips-enabled
       description: should fips be enabled
       value: false
@@ -675,11 +692,28 @@
       value: openshift-worker-node@acs-team-temp-dev.iam.gserviceaccount.com
       kind: optional
 
+    - name: cloud-provider
+      description: Cloud provider
+      value: gcp
+      kind: optional
+      help: gcp or aws
+
+    - name: base-domain
+      description: For gcp use ocp.infra.rox.systems or for aws use aws.dev.rox.systems
+      value: ocp.infra.rox.systems
+      kind: optional
+
     - name: region
       description: Google Cloud region to deploy infrastructure into.
       value: us-east1
       kind: optional
 
+    - name: network-stack
+      description: Network stack
+      value: ipv4
+      help: Network stack ipv4(default), dual/dual-ipv4-primary, dual-ipv6-primary
+      kind: optional
+
     - name: fips-enabled
       description: should fips be enabled
       value: false
@@ -812,6 +846,12 @@
       value: us-west-2
       kind: optional
 
+    - name: network-stack
+      description: Network stack
+      value: ipv4
+      kind: optional
+      help: Set network stack to ipv4(default) or ipv6
+
 #####################
 #  Azure AKS        #
 #####################
diff --git a/chart/infra-server/static/workflow-eks.yaml b/chart/infra-server/static/workflow-eks.yaml
index 805b00d39..d257ebf7f 100644
--- a/chart/infra-server/static/workflow-eks.yaml
+++ b/chart/infra-server/static/workflow-eks.yaml
@@ -18,6 +18,8 @@ spec:
         value: ""
       - name: region
         value: ""
+      - name: network-stack
+        value: ""
 
   templates:
     - name: start
@@ -76,6 +78,8 @@ spec:
             value: "infra"
           - name: REGION
             value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}'
+          - name: NETWORK_STACK
+            value: '{{ "{{" }}workflow.parameters.network-stack{{ "}}" }}'
 
         volumeMounts:
           - name: data
diff --git a/chart/infra-server/static/workflow-openshift-4.yaml b/chart/infra-server/static/workflow-openshift-4.yaml
index 74866f881..f50722991 100644
--- a/chart/infra-server/static/workflow-openshift-4.yaml
+++ b/chart/infra-server/static/workflow-openshift-4.yaml
@@ -20,8 +20,14 @@ spec:
       - name: worker-node-count
         value: ""
       - name: worker-node-service-account
+      - name: cloud-provider
+        value: ""
+      - name: base-domain
+        value: ""
       - name: region
         value: ""
+      - name: network-stack
+        value: ""
       - name: pull-secret
         value: ""
       - name: fips-enabled
@@ -109,7 +115,7 @@ spec:
         args:
           - create
           - '{{ "{{" }}workflow.parameters.name{{ "}}" }}'
-          - ocp.infra.rox.systems
+          - '{{ "{{" }}workflow.parameters.base-domain{{ "}}" }}'
         env:
           - name: GOOGLE_CREDENTIALS
             valueFrom:
@@ -118,6 +124,8 @@ spec:
                 key: google-credentials.json
           - name: GCP_PROJECT
             value : "acs-team-temp-dev"
+          - name: CLOUD_PROVIDER
+            value: '{{ "{{" }}workflow.parameters.cloud-provider{{ "}}" }}'
           - name: AWS_ACCESS_KEY_ID
             valueFrom:
               secretKeyRef:
@@ -151,6 +159,8 @@ spec:
             value: '{{ "{{" }}workflow.parameters.worker-node-service-account{{ "}}" }}'
           - name: REGION
             value: '{{ "{{" }}workflow.parameters.region{{ "}}" }}'
+          - name: NETWORK_STACK
+            value: '{{ "{{" }}workflow.parameters.network-stack{{ "}}" }}'
           - name: FIPS_ENABLED
             value: '{{ "{{" }}workflow.parameters.fips-enabled{{ "}}" }}'
           - name: INSTALL_HYPERSHIFT