diff --git a/GPClient/CMakeLists.txt b/GPClient/CMakeLists.txt
index e149e82..775ed48 100644
--- a/GPClient/CMakeLists.txt
+++ b/GPClient/CMakeLists.txt
@@ -34,7 +34,13 @@ add_3rdparty(
     SingleApplication
     GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
     GIT_TAG v3.3.0
-    CMAKE_ARGS -DQAPPLICATION_CLASS=QApplication
+    CMAKE_ARGS
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
+        -DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
+        -DCMAKE_INCLUDE_PATH=$ENV{CMAKE_INCLUDE_PATH}
+        -DCMAKE_LIBRARY_PATH=$ENV{CMAKE_LIBRARY_PATH}
+        -DQAPPLICATION_CLASS=QApplication
 )
 
 add_3rdparty(
diff --git a/GPService/CMakeLists.txt b/GPService/CMakeLists.txt
index c7205c3..69045de 100644
--- a/GPService/CMakeLists.txt
+++ b/GPService/CMakeLists.txt
@@ -26,7 +26,13 @@ add_3rdparty(
     SingleApplication
     GIT_REPOSITORY https://github.com/itay-grudev/SingleApplication.git
     GIT_TAG v3.3.0
-    CMAKE_ARGS -DQAPPLICATION_CLASS=QCoreApplication
+    CMAKE_ARGS
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}
+        -DCMAKE_PREFIX_PATH=$ENV{CMAKE_PREFIX_PATH}
+        -DCMAKE_INCLUDE_PATH=$ENV{CMAKE_INCLUDE_PATH}
+        -DCMAKE_LIBRARY_PATH=$ENV{CMAKE_LIBRARY_PATH}
+        -DQAPPLICATION_CLASS=QCoreApplication
 )
 
 ExternalProject_Get_Property(SingleApplication-${PROJECT_NAME} SOURCE_DIR BINARY_DIR)
diff --git a/GPService/main.cpp b/GPService/main.cpp
index 79c41be..5ee4910 100644
--- a/GPService/main.cpp
+++ b/GPService/main.cpp
@@ -1,6 +1,4 @@
-#include <iostream>
 #include <QtDBus/QtDBus>
-#include <QtCore/QProcessEnvironment>
 
 #include "gpservice.h"
 #include "singleapplication.h"
@@ -19,9 +17,6 @@ int main(int argc, char *argv[])
 
     GPService service;
 
-    QString env = "ENV: "  + QProcessEnvironment::systemEnvironment().toStringList().join("\n");
-    std::cout << env.toStdString();
-
     UnixSignalWatcher sigwatch;
     sigwatch.watchForSignal(SIGINT);
     sigwatch.watchForSignal(SIGTERM);
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2d2cf87..aa3549f 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -16,9 +16,7 @@ layout:
   /usr/share/vpnc-scripts:
     bind: $SNAP/usr/share/vpnc-scripts
   /usr/local/sbin:
-    bind: $SNAP/usr/local/sbin
-  /usr/share/qt5:
-    bind: $SNAP/usr/share/qt5
+    bind: $SNAP/usr/sbin
 
 slots:
   gpservice-slot:
@@ -34,10 +32,10 @@ plugs:
 
 apps:
   gpservice:
-    # daemon: simple
+    daemon: simple
     command: usr/bin/gpservice
-    extensions:
-      - kde-neon
+    command-chain:
+      - snap/command-chain/desktop-launch
     environment:
       LANG: en_US.utf8
     plugs:
@@ -62,24 +60,14 @@ apps:
 
 parts:
   application:
-    plugin: nil
+    plugin: cmake
     source: .
+    build-packages:
+      - libglu1-mesa-dev
     build-snaps:
       - kde-frameworks-5-core18-sdk
-    stage-snaps:
-      - kde-frameworks-5-core18
     stage-packages:
       - openconnect
-    override-build: |
-      KF5_DIR=/snap/kde-frameworks-5-core18-sdk/current
-
-      export QTDIR=$KF5_DIR/usr/lib/qt5
-      export PATH=$QTDIR/bin:$KF5_DIR/usr/bin:$PATH
-      export LD_LIBRARY_PATH=$KF5_DIR/usr/lib/$SNAPCRAFT_ARCH_TRIPLET:$QTDIR/lib:$LD_LIBRARY_PATH
-      export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig:$PKG_CONFIG_PATH
-      export QMAKESPEC=$KF5_DIR/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/mkspecs/linux-g++
-      # export QT_SELECT=qt5
-
-      qmake CONFIG+=release # -qtconf $KF5_DIR/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/qt.conf
-      make -j$(nproc)
-      make INSTALL_ROOT=$SNAPCRAFT_PART_INSTALL install
+      - libatm1
+    configflags:
+      - -DCMAKE_BUILD_TYPE=Release
\ No newline at end of file