diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cbad495a6f2036b23cf4d02057712d41dfae0090..e9e09310542d0cfd532f9789f0430663069a9e0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   DATABASE: "mongodb://%2Ftmp%2Fbisspropmongodb.sock"
   GIT_SUBMODULE_STRATEGY: normal
 
-build:
+make-linux:
   image: node:latest
   stage: build
   script:
@@ -26,3 +26,23 @@ build:
       - $CI_PROJECT_DIR/out/make/rpm/x64/*.rpm
   only:
     - master
+make-win32:
+  image: electronuserland/builder:wine-mono-05.21
+  stage: build
+  script:
+    - apt-get update -y
+    - apt-get install -y cmake rpm fakeroot dpkg
+    - cd $CI_PROJECT_DIR/src/backend
+    - yarn install
+    - cd $CI_PROJECT_DIR/
+    - yarn install
+    - rm -rf /root/.wine
+    - winecfg
+    - yarn make --platform win32 --target @electron-forge/maker-squirrel
+  artifacts:
+    expire_in: 1 week
+    paths:
+      - $CI_PROJECT_DIR/out/make/squirrel.windows/x64/*.exe
+      - $CI_PROJECT_DIR/out/make/squirrel.windows/x64/*.nupkg
+  only:
+    - master
diff --git a/package.json b/package.json
index cfab7c209380bf696c945076350dafbe94b8205a..7c740b067a9465d28717f0b29b6f4bf1baaac8cd 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,9 @@
   "license": "MIT",
   "config": {
     "forge": {
-      "packagerConfig": {},
+      "packagerConfig": {"asar":{ "unpack": "**/.webpack/main/resources/**/*",
+        "unpackDir": "./resources/app.asar"} 
+      },
       "makers": [
         {
           "name": "@electron-forge/maker-deb",