diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0db357e184..b40ca7b3db 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,9 +20,8 @@ jobs:
 
       # Rename the folder to openttd-NNN-source
       mkdir openttd-$(Build.BuildNumber)
-      find . -maxdepth 1 -not -name . -not -name openttd-$(Build.BuildNumber) -exec mv {} openttd-$(Build.BuildNumber)/ \;
-      # Copy back release_date, as it is needed for the template 'release-bundles'
-      cp openttd-$(Build.BuildNumber)/.release_date .release_date
+      find . -maxdepth 1 -not name release_files -not -name . -not -name openttd-$(Build.BuildNumber) -exec mv {} openttd-$(Build.BuildNumber)/ \;
+      cp release_files/* openttd-$(Build.BuildNumber)/
 
       mkdir bundles
       tar --xz -cf bundles/openttd-$(Build.BuildNumber)-source.tar.xz openttd-$(Build.BuildNumber)
@@ -92,6 +91,8 @@ jobs:
       BuildPlatform: $(BuildPlatform)
   - bash: |
       set -ex
+      mkdir bundle
+      cp -r release_files/* bundle/
       make -f Makefile.msvc bundle_pdb bundle_zip PLATFORM=$(BundlePlatform) BUNDLE_NAME=citymania-client-$(Build.BuildNumber)-$(BundlePlatform)
     displayName: 'Create bundles'
   - task: PublishBuildArtifacts@1
diff --git a/release_files/data/innerhighlight.grf b/release_files/bin/data/innerhighlight.grf
similarity index 100%
rename from release_files/data/innerhighlight.grf
rename to release_files/bin/data/innerhighlight.grf
diff --git a/release_files/scripts/autoexec.scr b/release_files/bin/scripts/autoexec.scr
similarity index 100%
rename from release_files/scripts/autoexec.scr
rename to release_files/bin/scripts/autoexec.scr
diff --git a/release_files/scripts/on_client.scr b/release_files/bin/scripts/on_client.scr
similarity index 100%
rename from release_files/scripts/on_client.scr
rename to release_files/bin/scripts/on_client.scr