diff --git a/jenkins-agent.Dockerfile b/Dockerfile.agent
similarity index 100%
rename from jenkins-agent.Dockerfile
rename to Dockerfile.agent
diff --git a/jenkins.Dockerfile b/Dockerfile.jenkins
similarity index 93%
rename from jenkins.Dockerfile
rename to Dockerfile.jenkins
index 31397e0..d521212 100644
--- a/jenkins.Dockerfile
+++ b/Dockerfile.jenkins
@@ -1,2 +1,2 @@
-FROM jenkins/jenkins:jdk17
+FROM jenkins/jenkins:jdk21
 RUN jenkins-plugin-cli --plugins 'configuration-as-code:latest ssh-slaves:latest credentials-binding:latest subversion:latest job-dsl:latest pipeline-model-definition:latest pipeline-build-step:latest ansible:latest git:latest workflow-aggregator:latest docker-workflow:latest ws-cleanup:latest pipeline-graph-view:latest ssh-agent:latest matrix-auth:latest'
diff --git a/docker-compose.yml b/docker-compose.yml
index 188e3e6..9fa1658 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,10 +2,9 @@ services:
   jenkins-controller:
     build:
       context: .
-      dockerfile: jenkins.Dockerfile
+      dockerfile: Dockerfile.jenkins
     environment:
       - CASC_JENKINS_CONFIG=/jenkins.yml
-      - CASC_RELOAD_TOKEN=$CASC_RELOAD_TOKEN
     volumes:
       - ./jenkins.yml:/jenkins.yml
       - ./id_rsa:/secrets/id_rsa
@@ -17,7 +16,7 @@ services:
     env_file: ./agent.env
     build:
       context: .
-      dockerfile: jenkins-agent.Dockerfile
+      dockerfile: Dockerfile.agent
       args:
         DOCKER_GROUP: '${DOCKER_GROUP}'
     volumes: