diff --git a/.ci/jenkins/Jenkinsfile.prod.nightly b/.ci/jenkins/Jenkinsfile.prod.nightly
index 77f18558..232835a3 100644
--- a/.ci/jenkins/Jenkinsfile.prod.nightly
+++ b/.ci/jenkins/Jenkinsfile.prod.nightly
@@ -2,7 +2,7 @@
 
 pipeline{
     agent{
-        label 'kie-rhel7 && kie-mem8g && !built-in'
+        label 'kie-rhel8 && kie-mem8g && !built-in'
     }
     tools {
       maven 'kie-maven-3.9.3'
diff --git a/.ci/nightly-build-config.yaml b/.ci/nightly-build-config.yaml
index 68b0fa9e..7fec1bc5 100644
--- a/.ci/nightly-build-config.yaml
+++ b/.ci/nightly-build-config.yaml
@@ -14,9 +14,6 @@ default:
   build-command:
     current: mvn clean install ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_CURRENT }}
     upstream: mvn clean install -Dquickly ${{ env.BUILD_MVN_OPTS }} ${{ env.BUILD_MVN_OPTS_UPSTREAM }}
-    after:
-      current: |
-        docker system prune -f
 
 build:
   - project: kiegroup/drools