diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
index dd13a37b5d..c09f99f334 100644
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -89,7 +89,7 @@ jobs:
           report_paths: '**/target/surefire-reports/TEST-*.xml'
 
   e2e:
-    name: Cypress end-to-end testing      
+    name: Cypress end-to-end testing
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
@@ -117,7 +117,7 @@ jobs:
           yarn install --frozen-lockfile
           yarn apiman:rebuild
           yarn ci
-        env: 
+        env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_DASHBOARD_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -160,11 +160,11 @@ jobs:
           ./mvnw -B clean package docker:build -P docker -DskipTests
           echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           docker push apiman/on-wildfly:latest
-          
+
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
           docker tag apiman/on-wildfly:latest ghcr.io/apiman/on-wildfly:latest
           docker push ghcr.io/apiman/on-wildfly:latest
-          
+
           ./mvnw -B deploy -DskipTests -Dmaven.test.skip=true
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
diff --git a/docs/modules/migration/pages/migrations.adoc b/docs/modules/migration/pages/migrations.adoc
index eaf7e871a4..a18618bbec 100644
--- a/docs/modules/migration/pages/migrations.adoc
+++ b/docs/modules/migration/pages/migrations.adoc
@@ -18,14 +18,18 @@ We have provided a migration assistant CLI tool in order to fix this.
 * In the `apiman` folder you will find a file called `migration-assistant-cli.jar`.
 * You can run the tool as follows. Note that it should be run against the *older/existing installation* (i.e. pre-2.1.0.Final):
 
-```
+[source,shell]
+----
 $ java -jar migration-assistant-cli.jar export upgrade \
   --username=admin <1>
   --password=admin123! <2>
   --endpoint=http://localhost:8080/apiman <3>
   --output=/home/myuser/fixed-export.json <4>
   --trust-all <5>
-```
+
+# or use it directly as a docker container
+$ docker run --rm -it ghcr.io/ghcr.io/apiman/migration-assistant export upgrade <...>
+----
 <1> An Apiman user with administrator privileges.
 <2> Password.
 <3> Apiman Manager API endpoint of your *old version of Apiman*, often this is your bound hostname followed by `/apiman`.
diff --git a/migration-assistant/pom.xml b/migration-assistant/pom.xml
index 02b9deb846..cc642bc74f 100644
--- a/migration-assistant/pom.xml
+++ b/migration-assistant/pom.xml
@@ -127,52 +127,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <profile>
-      <id>docker</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>io.fabric8</groupId>
-            <artifactId>docker-maven-plugin</artifactId>
-            <version>${version.docker.plugin}</version>
-            <executions>
-              <execution>
-                <id>docker-build</id>
-                <goals>
-                  <goal>build</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <images>
-                <image>
-                  <name>apiman/migration-assistant</name>
-                  <build>
-                    <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
-                    <assembly>
-                      <inline>
-                        <fileSets>
-                          <fileSet>
-                            <includes>
-                              <include>target/${project.artifactId}-${project.version}-shaded.jar</include>
-                            </includes>
-                            <outputDirectory></outputDirectory>
-                            <filtered>false</filtered>
-                            <directoryMode>0755</directoryMode>
-                            <fileMode>0755</fileMode>
-                          </fileSet>
-                        </fileSets>
-                      </inline>
-                    </assembly>
-                  </build>
-                </image>
-              </images>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
 </project>
\ No newline at end of file
diff --git a/migration-assistant/src/main/docker/Dockerfile b/migration-assistant/src/main/docker/Dockerfile
deleted file mode 100644
index d656d380c1..0000000000
--- a/migration-assistant/src/main/docker/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM adoptopenjdk/openjdk11:alpine-jre
-
-ADD maven/target/${project.artifactId}-${project.version}-shaded.jar /opt/apiman/apiman-migration-assistant.jar
-
-ENTRYPOINT ["java", "-jar", "/opt/apiman/apiman-migration-assistant.jar"]