diff --git a/Jenkinsfile b/Jenkinsfile
index 0f795b431..e939d1490 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,8 @@ pipeline
                     JOB_ID = "${env.BUILD_TAG}"
                     jenkinsLib = load("/home/jenkins/jenkins.groovy")
                     
-                    jenkinsLib.CreateBuildNode(JOB_ID)
+                    jenkinsLib.CreateUbuntuBuildNode(JOB_ID)
+                    jenkinsLib.CreateWindowsBuildNode(JOB_ID)
                 }
             }
         }
@@ -110,7 +111,7 @@ pipeline
                                             JOB_ID = "${env.BUILD_TAG}"
                                             jenkinsLib = load("/home/jenkins/jenkins.groovy")
                                             
-                                            jenkinsLib.CreateTestNode(JOB_ID)
+                                            jenkinsLib.CreateUbuntuTestNode(JOB_ID)
                                         }
                                     }
                                 }
@@ -143,7 +144,7 @@ pipeline
                                             JOB_ID = "${env.BUILD_TAG}"
                                             jenkinsLib = load("/home/jenkins/jenkins.groovy")
                                             
-                                            jenkinsLib.DeleteTestNode(JOB_ID)
+                                            jenkinsLib.DeleteUbuntuTestNode(JOB_ID)
                                         }
                                     }
                                 }
@@ -195,99 +196,108 @@ pipeline
                         }
                     }
                 }
-                // stage('windows')
-                // {
-                //     agent { label "windows && build && ${JOB_ID}" }
-                //     environment
-                //     {
-                //         UE4_ROOT = 'C:\\Program Files\\Epic Games\\UE_4.22'
-                //     }
-                //     stages
-                //     {
-                //         stage('windows setup')
-                //         {
-                //             steps
-                //             {
-                //                 bat """
-                //                     call ../setEnv64.bat
-                //                     make setup
-                //                 """
-                //             }
-                //         }
-                //         stage('windows build')
-                //         {
-                //             steps
-                //             {
-                //                 bat """
-                //                     call ../setEnv64.bat
-                //                     make LibCarla
-                //                     make PythonAPI
-                //                     make CarlaUE4Editor
-                //                 """
-                //                 // make examples
-                //             }
-                //             post
-                //             {
-                //                 always
-                //                 {
-                //                     archiveArtifacts 'PythonAPI/carla/dist/*.egg'
-                //                     stash includes: 'PythonAPI/carla/dist/*.egg', name: 'windows_eggs'
-                //                 }
-                //             }
-                //         }
-                //         // stage('windows unit tests')
-                //         // {
-                //         //     steps { bat 'rem Not Implemented'}
-                //         // }
-                //         stage('windows retrieve content')
-                //         {
-                //             steps
-                //             {
-                //                 bat """
-                //                     call ../setEnv64.bat
-                //                     call Update.bat
-                //                 """
-                //             }
-                //         }
-                //         stage('windows package')
-                //         {
-                //             steps
-                //             {
-                //                 bat """
-                //                     call ../setEnv64.bat
-                //                     make package
-                //                     make package ARGS="--packages=AdditionalMaps --clean"
-                //                 """
-                //                 // make examples ARGS="localhost 3654"
-                //             }
-                //             post {
-                //                 always {
-                //                     archiveArtifacts 'Build/UE4Carla/*.zip'
-                //                     // stash includes: 'Build/UE4Carla/CARLA*.zip', name: 'windows_package'
-                //                     // stash includes: 'Examples/', name: 'windows_examples'
-                //                 }
-                //             }
-                //         }
-                //         // stage('windows smoke test')
-                //         // {
-                //         //     steps { bat 'rem Not Implemented'}
-                //         // }
-                //         stage('windows deploy')
-                //         {
-                //             when { anyOf { branch "master"; buildingTag() } }
-                //             steps {
-                //                 bat """
-                //                     call ../setEnv64.bat
-                //                     make deploy ARGS="--replace-latest"
-                //                 """
-                //             }
-                //         }
-                //     }
-                //     post 
-                //     {
-                //         always { deleteDir() }
-                //     }
-                // }
+                stage('windows')
+                {
+                    agent { label "windows && build && ${JOB_ID}" }
+                    environment
+                    {
+                        UE4_ROOT = 'C:\\Program Files\\Epic Games\\UE_4.22'
+                    }
+                    stages
+                    {
+                        stage('windows setup')
+                        {
+                            steps
+                            {
+                                bat """
+                                    call ../setEnv64.bat
+                                    make setup
+                                """
+                            }
+                        }
+                        stage('windows build')
+                        {
+                            steps
+                            {
+                                bat """
+                                    call ../setEnv64.bat
+                                    make LibCarla
+                                """
+                                bat """
+                                    call ../setEnv64.bat
+                                    make PythonAPI
+                                """
+                                bat """
+                                    call ../setEnv64.bat
+                                    make CarlaUE4Editor
+                                """
+                                // make examples
+                            }
+                            post
+                            {
+                                always
+                                {
+                                    archiveArtifacts 'PythonAPI/carla/dist/*.egg'
+                                    stash includes: 'PythonAPI/carla/dist/*.egg', name: 'windows_eggs'
+                                }
+                            }
+                        }
+                        // stage('windows unit tests')
+                        // {
+                        //     steps { bat 'rem Not Implemented'}
+                        // }
+                        stage('windows retrieve content')
+                        {
+                            steps
+                            {
+                                bat """
+                                    call ../setEnv64.bat
+                                    call Update.bat
+                                """
+                            }
+                        }
+                        stage('windows package')
+                        {
+                            steps
+                            {
+                                bat """
+                                    call ../setEnv64.bat
+                                    make package
+                                """
+                                bat """
+                                    call ../setEnv64.bat
+                                    make package ARGS="--packages=AdditionalMaps --clean"
+                                """
+                                // make examples ARGS="localhost 3654"
+                            }
+                            post {
+                                always {
+                                    archiveArtifacts 'Build/UE4Carla/*.zip'
+                                    // stash includes: 'Build/UE4Carla/CARLA*.zip', name: 'windows_package'
+                                    // stash includes: 'Examples/', name: 'windows_examples'
+                                }
+                            }
+                        }
+                        // stage('windows smoke test')
+                        // {
+                        //     steps { bat 'rem Not Implemented'}
+                        // }
+                        stage('windows deploy')
+                        {
+                            when { anyOf { branch "master"; buildingTag() } }
+                            steps {
+                                bat """
+                                    call ../setEnv64.bat
+                                    make deploy ARGS="--replace-latest"
+                                """
+                            }
+                        }
+                    }
+                    post 
+                    {
+                        always { deleteDir() }
+                    }
+                }
             }
         }
     }
@@ -302,7 +312,8 @@ pipeline
                     JOB_ID = "${env.BUILD_TAG}"
                     jenkinsLib = load("/home/jenkins/jenkins.groovy")
                     
-                    jenkinsLib.DeleteBuildNode(JOB_ID)
+                    jenkinsLib.DeleteUbuntuBuildNode(JOB_ID)
+                    jenkinsLib.DeleteWindowsBuildNode(JOB_ID)
                 }
             }
         }