diff --git a/arthur-maven-plugin/pom.xml b/arthur-maven-plugin/pom.xml
index abf00bd..c4d500e 100644
--- a/arthur-maven-plugin/pom.xml
+++ b/arthur-maven-plugin/pom.xml
@@ -28,7 +28,7 @@
   <packaging>maven-plugin</packaging>
 
   <properties>
-    <mvn.version>3.6.0</mvn.version>
+    <mvn.version>3.6.3</mvn.version>
     <mvn-plugin.version>3.6.0</mvn-plugin.version>
     <geronimo-arthur.shortname>maven</geronimo-arthur.shortname>
   </properties>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>jib-core</artifactId>
-      <version>0.16.0</version>
+      <version>0.17.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/NativeImageMojo.java b/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/NativeImageMojo.java
index 1f365be..eccd570 100644
--- a/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/NativeImageMojo.java
+++ b/arthur-maven-plugin/src/main/java/org/apache/geronimo/arthur/maven/mojo/NativeImageMojo.java
@@ -587,6 +587,9 @@
         rootDependency.setType(artifact.getExtension());
 
         final MavenProject fakeProject = new MavenProject();
+        fakeProject.setRemoteArtifactRepositories(project.getRemoteArtifactRepositories());
+        fakeProject.setSnapshotArtifactRepository(project.getDistributionManagementArtifactRepository());
+        fakeProject.setPluginArtifactRepositories(project.getPluginArtifactRepositories());
         fakeProject.getDependencies().add(rootDependency);
 
         final DependencyResolutionRequest request = new DefaultDependencyResolutionRequest();
@@ -619,7 +622,7 @@
                     return true;
                 }
             });
-            return artifacts.stream();
+            return artifacts.stream().map(NativeImageMojo.this::resolve);
         } catch (final DependencyResolutionException e) {
             throw new IllegalStateException(e.getMessage(), e);
         }
