diff --git a/.ci/build.yml b/.ci/build.yml
index 70be04fa..14865b1e 100644
--- a/.ci/build.yml
+++ b/.ci/build.yml
@@ -23,16 +23,17 @@ steps:
         cleanTargetFolder: true
         contents: |
           **/*
-          !**/.ci/*
-          !**/.config/*
-          !**/.git**
+          !.ci/*
+          !.config/*
+          !.git/**/*
+          !.github/*
         TargetFolder: '$(Build.ArtifactStagingDirectory)/plugin.video.jellyfin'
 
     - task: ArchiveFiles@2
       displayName: 'Create ${{ py_version }} zip file'
       inputs:
         rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/plugin.video.jellyfin'
-        includeRootFolder: False
+        includeRootFolder: True
         archiveType: 'zip'
         tarCompression: 'none'
         archiveFile: '$(Build.ArtifactStagingDirectory)/plugin.video.jellyfin-${{ py_version }}.zip'
diff --git a/.ci/publish.yml b/.ci/publish.yml
index b4b69297..ff7f8e71 100644
--- a/.ci/publish.yml
+++ b/.ci/publish.yml
@@ -17,3 +17,10 @@ steps:
         sshEndpoint: repository
         runOptions: 'commands'
         commands: 'python3 /usr/local/bin/kodirepo add /srv/repository/incoming/kodi/plugin.video.jellyfin-${{ py_version }}.zip --datadir /srv/repository/releases/client/kodi/${{ py_version }}'
+
+    - task: SSH@0
+      displayName: 'Clean up zip files'
+      inputs:
+        sshEndpoint: repository
+        runOptions: 'commands'
+        commands: 'rm /srv/repository/incoming/kodi/plugin.video.jellyfin-${{ py_version }}.zip'