diff --git a/.appveyor.yml b/.appveyor.yml
index 0a3706eb..6f9fcffc 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -52,8 +52,9 @@ for:
   build_script:
     - make package -C tmp
   after_build:
-    - sudo dpkg -i build/softether-vpn*.deb
-    - sudo systemctl restart softether-vpnserver
+    - .ci/appveyor_afterbuild.sh
+  on_failure:
+    - sudo journalctl -xe
   artifacts:
     - path: build/*.deb
       name: Ubuntu
@@ -66,8 +67,9 @@ for:
   build_script:
     - make package -C tmp
   after_build:
-    - sudo dpkg -i build/softether-vpn*.deb
-    - sudo systemctl restart softether-vpnserver
+    - .ci/appveyor_afterbuild.sh
+  on_failure:
+    - sudo journalctl -xe
   artifacts:
     - path: build/*.deb
       name: Ubuntu
diff --git a/.ci/appveyor_afterbuild.sh b/.ci/appveyor_afterbuild.sh
new file mode 100755
index 00000000..f22759be
--- /dev/null
+++ b/.ci/appveyor_afterbuild.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -eux
+
+sudo dpkg -i build/softether-common*.deb
+sudo dpkg -i build/softether-vpnbridge*.deb
+sudo dpkg -i build/softether-vpnclient*.deb
+sudo dpkg -i build/softether-vpncmd*.deb
+sudo dpkg -i build/softether-vpnserver*.deb
+
+sudo systemctl restart softether-vpnserver
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bdef172..0c3a6cb8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,14 +12,6 @@
     - make package -C tmp
     - dpkg -i build/softether-vpn*.deb
 
-bionic: 
-  <<: *ubuntu_def
-  image: ubuntu:bionic
-
-xenial:     
-  <<: *ubuntu_def
-  image: ubuntu:xenial
-
 trusty:      
   <<: *ubuntu_def
   image: ubuntu:trusty