diff --git a/jboss/container/wildfly/galleon/build-feature-pack/configure.sh b/jboss/container/wildfly/galleon/build-feature-pack/configure.sh
index 662c8af5..90c0cbb8 100644
--- a/jboss/container/wildfly/galleon/build-feature-pack/configure.sh
+++ b/jboss/container/wildfly/galleon/build-feature-pack/configure.sh
@@ -39,7 +39,12 @@ if [ -f "${ZIPPED_REPO}" ]; then
     sh $GALLEON_MAVEN_REPO_HOOK_SCRIPT "$repoDir"
   fi
   mv $repoDir/maven-repository "$TMP_GALLEON_LOCAL_MAVEN_REPO"
-  
+  mkdir "$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_DIR/maven-repo-misc"
+  if [ "$(ls -A $repoDir)" ]; then
+    mv $repoDir/* "$JBOSS_CONTAINER_WILDFLY_S2I_GALLEON_DIR/maven-repo-misc"
+  fi
+  rm -rf $repoDir
+
   if [ "x$deleteBuildArtifacts" == "xtrue"  ]; then
     echo "Build artifacts are not kept, will be removed from galleon local cache"
     cp -r $TMP_GALLEON_LOCAL_MAVEN_REPO $GALLEON_LOCAL_MAVEN_REPO