diff --git a/content_sets.yml b/content_sets.yml
index 05e4fb7..2c97be7 100644
--- a/content_sets.yml
+++ b/content_sets.yml
@@ -1,5 +1,4 @@
-ppc64le:
-- rhel-7-server-for-power-le-rhscl-rpms
-- rhel-7-for-power-le-rpms
 x86_64:
-- rhel-7-server-rpms
+  - rhel-8-for-x86_64-baseos-rpms
+  - rhel-8-for-x86_64-appstream-rpms
+
diff --git a/cp-overrides.yaml b/cp-overrides.yaml
index 9a18c74..a4b6049 100644
--- a/cp-overrides.yaml
+++ b/cp-overrides.yaml
@@ -22,5 +22,5 @@ artifacts:
 osbs:
       repository:
             name: containers/jboss-eap-7
-            branch: jb-eap-7.3-cd-cp-rhel-7
+            branch: jb-eap-7.3-cd-cp-rhel-8
 
diff --git a/dev-overrides.yaml b/dev-overrides.yaml
index 7bda6f5..663a0d9 100644
--- a/dev-overrides.yaml
+++ b/dev-overrides.yaml
@@ -32,5 +32,5 @@ schema_version: 1
 osbs:
       repository:
             name: containers/jboss-eap-7
-            branch: jb-eap-7.3-cd-dev-rhel-7
+            branch: jb-eap-7.3-cd-dev-rhel-8
 
diff --git a/image.yaml b/image.yaml
index 6043c1d..a637251 100644
--- a/image.yaml
+++ b/image.yaml
@@ -2,11 +2,11 @@ schema_version: 1
 
 name: "jboss-eap-7/eap-cd"
 description: "The JBoss EAP continuous delivery (JBoss EAP CD) releases are intended to be Technology Preview - The JBoss EAP CD OpenShift container image is provided as technology preview. It is intended for development use only. It should NOT be deployed on production or in environments that are not intended for development use."
-version: "16.0"
-from: "rhel7:7-released"
+version: "17.0"
+from: "ubi8:8-released"
 labels:
     - name: "com.redhat.component"
-      value: "jboss-eap-7-eap-cd-container"
+      value: "jboss-eap-7-eap-cd-rhel8-container"
 
 packages:
        content_sets_file: content_sets.yml
@@ -20,7 +20,9 @@ modules:
           - path: modules
       install:
           - name: jboss.container.openjdk.jdk
-            version: "8"
+            version: "11"
+          - name: jboss.container.maven.35.bash
+            version: "3.5"
           - name: eap-cd-latest
 
 osbs:
@@ -28,4 +30,4 @@ osbs:
             container_file: container.yaml
       repository:
             name: containers/jboss-eap-7
-            branch: jb-eap-7.3-cd-rhel-7
+            branch: jb-eap-7.3-cd-rhel-8
diff --git a/modules/cd-17/install.sh b/modules/cd-17/install.sh
new file mode 100755
index 0000000..4ddab16
--- /dev/null
+++ b/modules/cd-17/install.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+SOURCES_DIR=/tmp/artifacts/
+DISTRIBUTION_ZIP="jboss-eap-cd.zip"
+
+unzip -d $SOURCES_DIR/eap-cd-dist -q $SOURCES_DIR/$DISTRIBUTION_ZIP
+DIST_NAME=`ls $SOURCES_DIR/eap-cd-dist`
+
+mv $SOURCES_DIR/eap-cd-dist/$DIST_NAME $JBOSS_HOME
+
diff --git a/modules/cd-17/module.yaml b/modules/cd-17/module.yaml
new file mode 100644
index 0000000..5ffd241
--- /dev/null
+++ b/modules/cd-17/module.yaml
@@ -0,0 +1,58 @@
+schema_version: 1
+
+name: "eap-cd-17"
+description: "JBoss Enterprise Application Platform CD 17 install"
+labels:
+    - name: "com.redhat.component"
+      value: "jboss-eap-7-eap-cd-container"
+    - name: "org.jboss.product"
+      value: "eap"
+    - name: "org.jboss.product.version"
+      value: "7.3.0"
+    - name: "org.jboss.product.eap.version"
+      value: "7.3.0"
+    - name: "com.redhat.deployments-dir"
+      value: "/opt/eap/standalone/deployments"
+    - name: "com.redhat.dev-mode"
+      value: "DEBUG:true"
+      description: "Environment variable used to enable development mode (debugging). A value of true will enable development mode."
+    - name: "com.redhat.dev-mode.port"
+      value: "DEBUG_PORT:8787"
+      description: "Environment variable used to specify the debug port. If not set, the default EAP debug port will be used (8787). Only applicable when development mode is enabled."
+envs:
+    - name: "LAUNCH_JBOSS_IN_BACKGROUND"
+      value: "true"
+    - name: "JBOSS_PRODUCT"
+      value: "eap"
+    - name: "JBOSS_EAP_VERSION"
+      value: "7.3.0-cd"
+    - name: "PRODUCT_VERSION"
+      value: "17.0"
+    - name: "JBOSS_HOME"
+      value: "/opt/eap"
+    - name: "DEBUG"
+      example: "true"
+      description: "Specify true to enable development mode (debugging)."
+    - name: "DEBUG_PORT"
+      example: "8787"
+      description: "Specify the port to use for debugging. If not set, the default EAP debug port will be used (8787).  Only applicable when development mode is enabled."
+ports:
+    - value: 8080
+    - value: 8787
+      expose: false
+
+artifacts:
+     - name: jboss-eap-cd.zip
+       target: jboss-eap-cd.zip
+       md5: 28a2da813ce9b7ee31977046326b8e27
+
+run:
+      user: 185
+      cmd:
+          - "/opt/eap/bin/standalone.sh"
+          - "-b"
+          - "0.0.0.0"
+
+execute:
+    - script: install.sh
+
diff --git a/modules/cd-latest/module.yaml b/modules/cd-latest/module.yaml
index 22a555b..82cf286 100644
--- a/modules/cd-latest/module.yaml
+++ b/modules/cd-latest/module.yaml
@@ -4,5 +4,5 @@ name: eap-cd-latest
 description: "Red Hat JBoss Enterprise Application Platform CD latest version install module"
 modules:
       install:
-          - name: eap-cd-16
+          - name: eap-cd-17
           - name: eap-install-cleanup
diff --git a/rel-overrides.yaml b/rel-overrides.yaml
index 0034620..46b69b9 100644
--- a/rel-overrides.yaml
+++ b/rel-overrides.yaml
@@ -12,5 +12,5 @@ schema_version: 1
 osbs:
       repository:
             name: containers/jboss-eap-7
-            branch: jb-eap-7.3-cd-rhel-7
+            branch: jb-eap-7.3-cd-rhel-8