diff --git a/README.adoc b/README.adoc
index 7a1a4b8..156f785 100644
--- a/README.adoc
+++ b/README.adoc
@@ -61,7 +61,7 @@ $ cd my_openshift/fuse-configmap-booster
 +
 [source,bash,options="nowrap",subs="attributes+"]
 ----
-$ mvn clean -DskipTests fabric8:deploy -Popenshift
+$ mvn clean -DskipTests oc:deploy -Popenshift
 ----
 
 . In your browser, navigate to the `MY_PROJECT_NAME` project in the OpenShift console.
@@ -109,7 +109,7 @@ $ cd my_openshift/fuse-configmap-booster
 +
 [source,bash,options="nowrap",subs="attributes+"]
 ----
-$ mvn clean -DskipTests fabric8:deploy -Popenshift -Dfabric8.generator.fromMode=istag -Dfabric8.generator.from=MY_PROJECT_NAME/{image-name-version}
+$ mvn clean -DskipTests oc:deploy -Popenshift -Djkube.generator.fromMode=istag -Djkube.generator.from=MY_PROJECT_NAME/{image-name-version}
 ----
 
 . In your browser, navigate to the `MY_PROJECT_NAME` project in the OpenShift console.
diff --git a/pom.xml b/pom.xml
index bbd8d01..373cee3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <fuse.bom.version>7.8.0.fuse-sb2-780038-redhat-00001</fuse.bom.version>
+        <docker.image.version>1.7</docker.image.version>
     </properties>
 
     <dependencyManagement>
@@ -207,19 +208,51 @@
     <profiles>
         <profile>
             <id>openshift</id>
+            <properties>
+                <jkube.generator.from>registry.redhat.io/fuse7/fuse-java-openshift:${docker.image.version}</jkube.generator.from>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.jboss.redhat-fuse</groupId>
-                        <artifactId>fabric8-maven-plugin</artifactId>
+                        <artifactId>openshift-maven-plugin</artifactId>
                         <executions>
                             <execution>
                                 <goals>
                                     <goal>resource</goal>
                                     <goal>build</goal>
+                                    <goal>apply</goal>
                                 </goals>
                             </execution>
                         </executions>
+                        <configuration>
+                            <resources>
+                                <labels>
+                                    <pod>
+                                        <property>
+                                            <name>com.company</name>
+                                            <value>Red_Hat</value>
+                                        </property>
+                                        <property>
+                                            <name>rht.prod_name</name>
+                                            <value>Red_Hat_Integration</value>
+                                        </property>
+                                        <property>
+                                            <name>rht.prod_ver</name>
+                                            <value>7.9</value>
+                                        </property>
+                                        <property>
+                                            <name>rht.comp</name>
+                                            <value>spring-boot-camel</value>
+                                        </property>
+                                        <property>
+                                            <name>rht.comp_ver</name>
+                                            <value>${fuse.bom.version}</value>
+                                        </property>
+                                    </pod>
+                                </labels>
+                            </resources>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
diff --git a/src/main/fabric8/cm.yml b/src/main/jkube/cm.yml
similarity index 100%
rename from src/main/fabric8/cm.yml
rename to src/main/jkube/cm.yml
diff --git a/src/main/fabric8/deployment.yml b/src/main/jkube/deployment.yml
similarity index 100%
rename from src/main/fabric8/deployment.yml
rename to src/main/jkube/deployment.yml
diff --git a/src/main/fabric8/rb.yml b/src/main/jkube/rb.yml
similarity index 100%
rename from src/main/fabric8/rb.yml
rename to src/main/jkube/rb.yml
diff --git a/src/main/fabric8/sa.yml b/src/main/jkube/sa.yml
similarity index 100%
rename from src/main/fabric8/sa.yml
rename to src/main/jkube/sa.yml