diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a3694c848c4ab5d6080a8af292454766b235b52..47df703911ed5eace7ee27a97cb1987bad272fbf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,19 +131,18 @@ build:edge:release:
 .build:chrome:
   stage: build
   image: python:3.7-stretch
-  script:
-    - apt-get -y update
-    - apt-get -y install zip
-    - cd build/chrome
-    - zip -r ../../safelinks-cleaner-edge-$VARIANT.zip *
   artifacts:
     paths:
-      - safelinks-cleaner-edge-$VARIANT.zip
+      - safelinks-cleaner-chrome-$VARIANT.zip
 
 build:chrome:beta:
   extends: .build:chrome
   variables:
     VARIANT: beta
+  script:
+    - apt-get -y update
+    - apt-get -y install zip
+    - bash scripts/crxbuild.sh -o safelinks-cleaner-chrome-$VARIANT.crx -k "$CHROME_SIGNING_KEY" -s build/chrome
   rules:
     - if: '$CI_COMMIT_BRANCH != "master"'
       when: never
@@ -163,6 +162,11 @@ build:chrome:release:
   extends: .build:chrome
   variables:
     VARIANT: release
+  script:
+    - apt-get -y update
+    - apt-get -y install zip
+    - cd build/chrome
+    - zip -r ../../safelinks-cleaner-chrome-$VARIANT.zip *
   <<: *release_rules
     
 
@@ -280,7 +284,7 @@ pages:
     - cp safelinks-cleaner-firefox-beta.xpi .public
     - cp safelinks-cleaner-thunderbird-beta.xpi .public
     - cp safelinks-cleaner-edge-beta.zip .public
-    - cp safelinks-cleaner-edge-chrome.zip .public
+    - cp safelinks-cleaner-edge-chrome.crx .public
     - mv .public public
     - ls -lR public
   needs:
diff --git a/site/index.html b/site/index.html
index a87217d6469a0b58328aec45ae72df1242c69166..2d9cc3f686cad719c2953e6bbbb460c95ccfe864 100644
--- a/site/index.html
+++ b/site/index.html
@@ -91,7 +91,7 @@
 		  Download the Safe Links Cleaner beta version for
 		  the Google Chrome Browser.
 		</p>
-                <a class="btn btn-blue" href="safelinks-cleaner-chrome-beta.zip">Beta</a>
+                <a class="btn btn-blue" href="safelinks-cleaner-chrome-beta.crx">Beta</a>
               </div><!--//item-inner-->
             </div><!--//item-->
             <div class="item item-primary col-lg-4 col-6">