diff --git a/questiongenerator/Dockerfile b/questiongenerator/Dockerfile
index 3c27189d..8c4e37dd 100644
--- a/questiongenerator/Dockerfile
+++ b/questiongenerator/Dockerfile
@@ -15,5 +15,5 @@ ARG DATABASE_PASSWORD
 ENV DATABASE_URL jdbc:postgresql://WIQ_DB:5432/wiq
 ENV DATABASE_USER $DATABASE_USER
 ENV DATABASE_PASSWORD $DATABASE_PASSWORD
-COPY --from=build /questiongenerator/target/QuestionGenerator-1.0-SNAPSHOT.jar app.jar
+COPY --from=build /questiongenerator/target/QuestionGenerator-1.0-SNAPSHOT-jar-with-dependencies.jar app.jar
 ENTRYPOINT ["java","-jar","app.jar"]
\ No newline at end of file
diff --git a/questiongenerator/pom.xml b/questiongenerator/pom.xml
index e1a94aa6..8317bb33 100644
--- a/questiongenerator/pom.xml
+++ b/questiongenerator/pom.xml
@@ -46,17 +46,49 @@
             <scope>runtime</scope>
             <version>42.6.1</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <version>3.4.2</version>
+            <type>maven-plugin</type>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <archive>
+                        <manifest>
+                            <mainClass>Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <archive>
+                        <manifest>
+                            <mainClass>Main</mainClass>
+                        </manifest>
+                    </archive>
                 </configuration>
             </plugin>
         </plugins>