diff --git a/Psalmenweb-nieuw/Dockerfile b/Psalmenweb-nieuw/Dockerfile
new file mode 100644
index 0000000..82c226d
--- /dev/null
+++ b/Psalmenweb-nieuw/Dockerfile
@@ -0,0 +1,19 @@
+# Use OpenJDK 17 as the base image
+FROM openjdk:17-jdk-slim
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy the JAR file into the container
+# Replace 'your-app.jar' with your actual JAR file name
+COPY target/*.jar app.jar
+
+# Expose port 8090
+EXPOSE 8090
+
+# Create a non-root user for security
+RUN addgroup --system spring && adduser --system spring --ingroup spring
+USER spring:spring
+
+# Run the application
+ENTRYPOINT ["java", "-jar", "app.jar"]
\ No newline at end of file
diff --git a/Psalmenweb-nieuw/pom.xml b/Psalmenweb-nieuw/pom.xml
index 2bcf238..3c13d2b 100644
--- a/Psalmenweb-nieuw/pom.xml
+++ b/Psalmenweb-nieuw/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.4.RELEASE</version>
+		<version>3.5.3</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.tenvoorde</groupId>
@@ -15,7 +15,7 @@
 	<name>psalmenweb</name>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 
 	<dependencies>
@@ -65,8 +65,9 @@
 			</exclusions>
 		</dependency>
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
+			<version>9.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
@@ -74,11 +75,15 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>jstl</artifactId>
-			<version>1.2</version>
+			<groupId>jakarta.servlet.jsp.jstl</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+			<version>3.0.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.web</groupId>
+			<artifactId>jakarta.servlet.jsp.jstl</artifactId>
+			<version>3.0.1</version>
 		</dependency>
-
 	</dependencies>
 
 	<build>
@@ -87,15 +92,11 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-				<version>2.3.3.RELEASE</version>
-			</plugin>
+
 			<plugin>
 				<groupId>org.codehaus.cargo</groupId>
-				<artifactId>cargo-maven2-plugin</artifactId>
-				<version>1.8.1</version>
+				<artifactId>cargo-maven3-plugin</artifactId>
+				<version>1.10.20</version>
 				<configuration>
 					<container>
 						<containerId>tomcat9x</containerId>
diff --git a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/controllers/BijbelController.java b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/controllers/BijbelController.java
index 5a6cb9b..68f0693 100644
--- a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/controllers/BijbelController.java
+++ b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/controllers/BijbelController.java
@@ -1,5 +1,6 @@
 package org.tenvoorde.psalmenweb.controllers;
 
+import jakarta.servlet.ServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -12,7 +13,6 @@ import org.tenvoorde.psalmenweb.dao.VertalingDao;
 import org.tenvoorde.psalmenweb.domain.BijbelBoek;
 import org.tenvoorde.psalmenweb.domain.Bijbelvers;
 
-import javax.servlet.ServletRequest;
 import java.util.List;
 
 @Controller
diff --git a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/BijbelBoek.java b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/BijbelBoek.java
index 633e590..704eeec 100644
--- a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/BijbelBoek.java
+++ b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/BijbelBoek.java
@@ -1,18 +1,21 @@
 package org.tenvoorde.psalmenweb.domain;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.*;
-
 @Getter @Setter @ToString
 @Entity
 @Table(name = "BOEK", schema="psalmenweb")
 public class BijbelBoek {
 
 	@Id
-	@GeneratedValue
+//	@GeneratedValue
 	@Column(name = "ID")
 	private int id;
 
diff --git a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Bijbelvers.java b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Bijbelvers.java
index edf0cf8..6378be2 100644
--- a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Bijbelvers.java
+++ b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Bijbelvers.java
@@ -1,10 +1,14 @@
 package org.tenvoorde.psalmenweb.domain;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @Getter @Setter @ToString
@@ -15,7 +19,7 @@ public class Bijbelvers implements Serializable {
 	private static final long serialVersionUID = 4765101556890177766L;
 
 	@Id
-	@GeneratedValue
+//	@GeneratedValue
 	@Column(name = "ID")
 	private int id;
 	
diff --git a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/CatechismusVraag.java b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/CatechismusVraag.java
index 18ea84f..ab02ca4 100644
--- a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/CatechismusVraag.java
+++ b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/CatechismusVraag.java
@@ -1,10 +1,14 @@
 package org.tenvoorde.psalmenweb.domain;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @Getter @Setter @ToString
@@ -15,7 +19,7 @@ public class CatechismusVraag implements Serializable {
 	private static final long serialVersionUID = 4234966319088621876L;
 
 	@Id
-	@GeneratedValue
+//	@GeneratedValue
 	@Column(name = "ID")
 	private int id;
 	
diff --git a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Psalmregel.java b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Psalmregel.java
index f632b5d..212f146 100644
--- a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Psalmregel.java
+++ b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Psalmregel.java
@@ -1,10 +1,14 @@
 package org.tenvoorde.psalmenweb.domain;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.persistence.*;
 import java.io.Serializable;
 
 @Getter @Setter @ToString
@@ -15,7 +19,7 @@ public class Psalmregel implements Serializable {
 	private static final long serialVersionUID = 4765101556890177766L;
 
 	@Id
-	@GeneratedValue
+//	@GeneratedValue
 	@Column(name = "ID")
 	private int id;
 	
diff --git a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Vertaling.java b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Vertaling.java
index 755b65e..c521262 100644
--- a/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Vertaling.java
+++ b/Psalmenweb-nieuw/src/main/java/org/tenvoorde/psalmenweb/domain/Vertaling.java
@@ -1,13 +1,17 @@
 package org.tenvoorde.psalmenweb.domain;
 
-import javax.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "VERTALING", schema = "psalmenweb")
 public class Vertaling {
 
 	@Id
-	@GeneratedValue
+//	@GeneratedValue
 	@Column(name = "ID")
 	private int id;
 
diff --git a/Psalmenweb-nieuw/src/main/resources/application.properties b/Psalmenweb-nieuw/src/main/resources/application.properties
index 9cc44a0..659b00d 100644
--- a/Psalmenweb-nieuw/src/main/resources/application.properties
+++ b/Psalmenweb-nieuw/src/main/resources/application.properties
@@ -9,3 +9,4 @@ spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect
 
 spring.mvc.view.prefix=/WEB-INF/views/
 spring.mvc.view.suffix=.jsp
+server.port=8090
\ No newline at end of file
diff --git a/Psalmenweb-nieuw/src/main/webapp/WEB-INF/views/bijbel.jsp b/Psalmenweb-nieuw/src/main/webapp/WEB-INF/views/bijbel.jsp
index 5026041..bc50934 100644
--- a/Psalmenweb-nieuw/src/main/webapp/WEB-INF/views/bijbel.jsp
+++ b/Psalmenweb-nieuw/src/main/webapp/WEB-INF/views/bijbel.jsp
@@ -1,5 +1,5 @@
 <%@ page session="false"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <html>
 <head>
 <title>${boek.boek} <c:if test="${boek.hoofdstukken > 1}">${hoofdstuk} </c:if>(${vertaling.afkorting})</title>