diff --git a/minifi-c2/minifi-c2-docker/pom.xml b/minifi-c2/minifi-c2-docker/pom.xml
index f2c9e3a3b..a335983e5 100644
--- a/minifi-c2/minifi-c2-docker/pom.xml
+++ b/minifi-c2/minifi-c2-docker/pom.xml
@@ -52,7 +52,7 @@ limitations under the License.
                             </execution>
                         </executions>
                         <configuration>
-                            <imageName>apacheminific2</imageName>
+                            <imageName>apache/nifi-minifi-c2</imageName>
                             <dockerDirectory>${project.basedir}/dockermaven</dockerDirectory>
                             <imageTags>
                                <imageTag>${minifi.c2.version}</imageTag>
diff --git a/minifi-docker/dockerhub/DockerImage.txt b/minifi-docker/dockerhub/DockerImage.txt
index 6d1141da9..446bfaa36 100644
--- a/minifi-docker/dockerhub/DockerImage.txt
+++ b/minifi-docker/dockerhub/DockerImage.txt
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apache/nifi-minifi:0.5.0
+apache/nifi-minifi:0.6.0
diff --git a/minifi-docker/pom.xml b/minifi-docker/pom.xml
index 1867e9bb0..93493b83b 100644
--- a/minifi-docker/pom.xml
+++ b/minifi-docker/pom.xml
@@ -52,10 +52,10 @@ limitations under the License.
                             </execution>
                         </executions>
                         <configuration>
-                            <imageName>apacheminifi</imageName>
+                            <imageName>apache/nifi-minifi</imageName>
                             <dockerDirectory>${project.basedir}/dockermaven</dockerDirectory>
                             <imageTags>
-                               <imageTag>${minifi.version}</imageTag>
+                               <imageTag>${minifi.version}-maven</imageTag>
                             </imageTags>
                             <buildArgs>
                                 <UID>1000</UID>