diff --git a/debian/control b/debian/control
index 022f60dce6..e61bc4efb6 100644
--- a/debian/control
+++ b/debian/control
@@ -44,43 +44,7 @@ Homepage: http://sipwise.com/
 
 Package: ngcp-panel
 Architecture: all
-Depends: ngcp-panel-common (> 1.0.14),
-         ngcp-panel-nginx | ngcp-panel-webserver,
-         ${misc:Depends}
-Description: Catalyst based application
- A completely overhauled provisioning interface for the
- NGCP system.
- .
- This is a dependency package to install either ngpcp-panel-nginx
- (by default) or ngcp-panel-apache.
-
-Package: ngcp-panel-apache
-Architecture: all
-Pre-Depends: apache2.2-common,
-             libapache2-mod-perl2
-Depends: ngcp-panel-common (>= ${binary:Version}),
-         ${misc:Depends}
-Conflicts: ngcp-panel-nginx
-Provides: ngcp-panel-webserver
-Description: Catalyst based application. Using mod-perl
- A completely overhauled provisioning interface for the
- NGCP system.
-
-Package: ngcp-panel-nginx
-Architecture: all
 Pre-Depends: nginx-common
-Depends: libfcgi-procmanager-perl,
-         ngcp-panel-common (>= ${binary:Version}),
-         ngcp-templates-ce-ngcp-panel (> 3.0.15) | ngcp-templates-pro-ngcp-panel (> 3.0.15),
-         ${misc:Depends}
-Conflicts: ngcp-panel-apache
-Provides: ngcp-panel-webserver
-Description: Catalyst based application. Using starman+nginx
- A completely overhauled provisioning interface for the
- NGCP system.
-
-Package: ngcp-panel-common
-Architecture: all
 Replaces: ngcp-panel (<= 1.0.14)
 Breaks: ngcp-panel (<= 1.0.14)
 Depends: libcatalyst-actionrole-acl-perl,
@@ -95,6 +59,7 @@ Depends: libcatalyst-actionrole-acl-perl,
          libdatetime-perl,
          libdbix-class-resultset-recursiveupdate-perl (>= 0.30~),
          libemail-valid-perl,
+         libfcgi-procmanager-perl,
          libfile-type-perl,
          libgd-gd2-perl,
          libhash-merge-simple-perl,
@@ -120,6 +85,7 @@ Depends: libcatalyst-actionrole-acl-perl,
          liburi-encode-perl,
          libxml-mini-perl,
          ngcp-schema,
+         ngcp-templates-ce-ngcp-panel (> 3.0.15) | ngcp-templates-pro-ngcp-panel (> 3.0.15),
          ${misc:Depends},
          ${perl:Depends}
 Description: Catalyst based application
diff --git a/debian/ngcp-panel-apache.install b/debian/ngcp-panel-apache.install
deleted file mode 100644
index 6623e9f935..0000000000
--- a/debian/ngcp-panel-apache.install
+++ /dev/null
@@ -1 +0,0 @@
-etc/apache2/ngcp-panel	etc/apache2/sites-available/
diff --git a/debian/ngcp-panel-apache.links b/debian/ngcp-panel-apache.links
deleted file mode 100644
index 9ac2c2e2e8..0000000000
--- a/debian/ngcp-panel-apache.links
+++ /dev/null
@@ -1 +0,0 @@
-etc/apache2/sites-available/ngcp-panel etc/apache2/sites-enabled/ngcp-panel
diff --git a/debian/ngcp-panel-apache.postinst b/debian/ngcp-panel-apache.postinst
deleted file mode 100644
index 854b88e7c0..0000000000
--- a/debian/ngcp-panel-apache.postinst
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# don't do anything when called with other argument than configure
-case "$1" in
-  configure)
-  ;;
-  abort-upgrade|abort-remove|abort-deconfigure)
-    exit 0
-  ;;
-  *)
-    echo "postinst called with unknown argument \$1'" >&2
-    exit 1
-  ;;
-esac
-
-# enable required modules
-a2enmod ssl perl
-
-# enable optional modules
-a2enmod dump_io || echo "Missing some optional Apache module(s), ignoring."
-
-# disable debian's default Apache site
-if [ -e /etc/apache2/sites-enabled/default ] || [ -e /etc/apache2/sites-enabled/000-default ]; then
-    a2dissite default
-fi
-
-# reload perl and/or apache modules
-if [ -x /etc/init.d/apache2 ]; then
-  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-    invoke-rc.d apache2 restart || true
-  else
-    /etc/init.d/apache2 restart || true
-  fi
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
\ No newline at end of file
diff --git a/debian/ngcp-panel-apache.preinst b/debian/ngcp-panel-apache.preinst
deleted file mode 100644
index 4210ddeaa2..0000000000
--- a/debian/ngcp-panel-apache.preinst
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-# preinst script for #PACKAGE#
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    if [ -e /etc/ningx/sites-enabled/ngcp-panel ]; then
-    	echo "Deactivating ngcp-panel on nginx"
-    	rm /etc/ningx/sites-enabled/ngcp-panel
-    fi
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# reload nginx
-if [ -x /etc/init.d/nginx ]; then
-  if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-    invoke-rc.d nginx reload || true
-  else
-    /etc/init.d/nginx reload || true
-  fi
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/ngcp-panel-common.install b/debian/ngcp-panel-common.install
deleted file mode 100644
index 1c812b48d6..0000000000
--- a/debian/ngcp-panel-common.install
+++ /dev/null
@@ -1,3 +0,0 @@
-ngcp_panel.conf		etc/ngcp-panel/
-share/*			usr/share/ngcp-panel/
-debian/tmp/usr/share/*  usr/share/
diff --git a/debian/ngcp-panel-nginx.default b/debian/ngcp-panel.default
similarity index 100%
rename from debian/ngcp-panel-nginx.default
rename to debian/ngcp-panel.default
diff --git a/debian/ngcp-panel-nginx.init b/debian/ngcp-panel.init
similarity index 98%
rename from debian/ngcp-panel-nginx.init
rename to debian/ngcp-panel.init
index 3ca1a04f62..8916dbc6bd 100644
--- a/debian/ngcp-panel-nginx.init
+++ b/debian/ngcp-panel.init
@@ -5,6 +5,7 @@
 # Required-Stop:     $syslog $network $local_fs $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
+# Should-Start:      sshd
 # Short-Description: Start the ngcp-panel webapp
 # Description:       Start the ngcp-panel webapp
 ### END INIT INFO
@@ -16,7 +17,7 @@ HOMEDIR=/usr/share/ngcp-panel
 PIDFILE=/var/run/ngcp-panel.pid
 USER=www-data
 GROUP=www-data
-NAME="ngcp-panel-nginx"
+NAME="ngcp-panel"
 DESC="NGCP-Panel Webapp"
 DEFAULTS=/etc/default/$NAME
 USOCKET=/var/run/ngcp-panel.sock
diff --git a/debian/ngcp-panel-nginx.install b/debian/ngcp-panel.install
similarity index 57%
rename from debian/ngcp-panel-nginx.install
rename to debian/ngcp-panel.install
index 1ff3092d55..9e24ebecea 100644
--- a/debian/ngcp-panel-nginx.install
+++ b/debian/ngcp-panel.install
@@ -1,2 +1,4 @@
 ngcp_panel.psgi usr/share/ngcp-panel/
 script/ngcp_panel_fastcgi.pl usr/share/ngcp-panel/
+ngcp_panel.conf		etc/ngcp-panel/
+share/*			usr/share/ngcp-panel/
diff --git a/debian/ngcp-panel-nginx.links b/debian/ngcp-panel.links
similarity index 100%
rename from debian/ngcp-panel-nginx.links
rename to debian/ngcp-panel.links
diff --git a/debian/ngcp-panel-nginx.postinst b/debian/ngcp-panel.postinst
similarity index 100%
rename from debian/ngcp-panel-nginx.postinst
rename to debian/ngcp-panel.postinst
diff --git a/debian/ngcp-panel-nginx.preinst b/debian/ngcp-panel.preinst
similarity index 100%
rename from debian/ngcp-panel-nginx.preinst
rename to debian/ngcp-panel.preinst