diff --git a/Makefile b/Makefile
index 853d556a0522c49ab00c34c71895be95a3a7b498..21cec54c4cc355f5b732df80b9317792067de111 100644
--- a/Makefile
+++ b/Makefile
@@ -2,29 +2,24 @@
 # Plugin, welches Matroska/FFv1 via mediaconch validiert
 
 # Pfad zu Java
-JAVAPATH=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
-JAVARELEASE=17
+JAVAPATH:=$(wildcard /usr/lib/jvm/java-1.17.0-openjdk-*/bin/)
+JAVARELEASE:=17
 
 # Verwendete Rosetta-Version
-ROSETTAVERSION:=7.3.0
-
-# Pfad zum Rosetta-SDK
-ROSETTASDK:=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/lib/
-# Pfad zum Rosetta-SDK, Deposit-Module
-ROSETTASDKDEPOSIT:=${ROSETTASDK}/../dps-sdk-projects/dps-sdk-deposit/lib
-ROSETTASDKPLUGINS:=${ROSETTASDK}/../../bundled_plugins/
-ROSETTASDKJARS=$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar")
+ROSETTAVERSION:=8.0.0
+
+# Pfad zum Rosetta-SDK und lokalen JARs
+ROSETTASDK:=/exlibris/dps/d4_1/system.dir/dps-sdk-${ROSETTAVERSION}/dps-sdk-projects/dps-sdk-deposit/lib/
 LOCALJARS=$(shell if [ -d lib ]; then find lib -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"; fi)
-JAR:=XmlFormatValidationPlugin.jar
 
 # classpath
-JUNITCLASSPATH:=./java/:./resources/:/usr/share/java/junit4.jar:$(shell find ${ROSETTASDKDEPOSIT} -name "*.jar" -print |xargs echo |sed -e "s/ /:/g"):$(JAR)
-#SOURCESCLASSPATH=org/slub/rosetta/dps/repository/plugin/storage/nfs
-CLASSPATH:=${ROSETTASDKDEPOSIT}/dps-sdk-${ROSETTAVERSION}.jar:${LOCALJARS}
-#BUILDPATH=$(CLASSPATH)
+JUNITCLASSPATH:=./java/:./resources/:/usr/share/java/junit4.jar
+CLASSPATH:=$(shell find ${ROSETTASDK} -name "*.jar" -print | xargs echo | sed -e "s/ /:/g"):${LOCALJARS}
 
 # sources
-SOURCES:=$(shell find java/ -name "*.java" -print | xargs echo )
+PLUGINCLASS:=XmlFormatValidationPlugin
+JAR:=${PLUGINCLASS}.jar
+SOURCES:=$(shell find java/ -name "*.java" -print | xargs echo)
 OBJS:=$(SOURCES:.java=.class)
 BUILD:=build/