diff --git a/etc/nginx/sites-available/dashkiosk.beelink.server.conf b/etc/nginx/sites-available/dashkiosk.beelink.server.conf
index a75d710..35960ac 100644
--- a/etc/nginx/sites-available/dashkiosk.beelink.server.conf
+++ b/etc/nginx/sites-available/dashkiosk.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = dashkiosk.asus.laptop.key
+default_keyfile    = dashkiosk.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = dashkiosk.asus.laptop
+commonName_default          = dashkiosk.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = dashkiosk.asus.laptop
+DNS.1   = dashkiosk.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/nginx/sites-available/gogs3757.beelink.server.conf b/etc/nginx/sites-available/gogs3757.beelink.server.conf
index c05ccb2..8b8c8ad 100644
--- a/etc/nginx/sites-available/gogs3757.beelink.server.conf
+++ b/etc/nginx/sites-available/gogs3757.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = gogs3757.asus.laptop.key
+default_keyfile    = gogs3757.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = gogs3757.asus.laptop
+commonName_default          = gogs3757.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = gogs3757.asus.laptop
+DNS.1   = gogs3757.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/nginx/sites-available/music3757.beelink.server.conf b/etc/nginx/sites-available/music3757.beelink.server.conf
index 846b220..308274f 100644
--- a/etc/nginx/sites-available/music3757.beelink.server.conf
+++ b/etc/nginx/sites-available/music3757.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = music3757.asus.laptop.key
+default_keyfile    = music3757.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = music3757.asus.laptop
+commonName_default          = music3757.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = music3757.asus.laptop
+DNS.1   = music3757.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/nginx/sites-available/nextcloud3757.beelink.server.conf b/etc/nginx/sites-available/nextcloud3757.beelink.server.conf
index e5c115f..0d40fd5 100644
--- a/etc/nginx/sites-available/nextcloud3757.beelink.server.conf
+++ b/etc/nginx/sites-available/nextcloud3757.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = nextcloud3757.asus.laptop.key
+default_keyfile    = nextcloud3757.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = nextcloud3757.asus.laptop
+commonName_default          = nextcloud3757.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = nextcloud3757.asus.laptop
+DNS.1   = nextcloud3757.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/nginx/sites-available/phares3757.beelink.server.conf b/etc/nginx/sites-available/phares3757.beelink.server.conf
index 7d34c2d..9da5282 100644
--- a/etc/nginx/sites-available/phares3757.beelink.server.conf
+++ b/etc/nginx/sites-available/phares3757.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = phares3757.asus.laptop.key
+default_keyfile    = phares3757.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = phares3757.asus.laptop
+commonName_default          = phares3757.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = phares3757.asus.laptop
+DNS.1   = phares3757.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/nginx/sites-available/photoprism.beelink.server.conf b/etc/nginx/sites-available/photoprism.beelink.server.conf
index 3b621a2..9dd3edb 100644
--- a/etc/nginx/sites-available/photoprism.beelink.server.conf
+++ b/etc/nginx/sites-available/photoprism.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = photoprism.asus.laptop.key
+default_keyfile    = photoprism.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = photoprism.asus.laptop
+commonName_default          = photoprism.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = photoprism.asus.laptop
+DNS.1   = photoprism.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/nginx/sites-available/pi-hole.beelink.server.conf b/etc/nginx/sites-available/pi-hole.beelink.server.conf
index 8cce435..608dd80 100644
--- a/etc/nginx/sites-available/pi-hole.beelink.server.conf
+++ b/etc/nginx/sites-available/pi-hole.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = pi-hole.asus.laptop.key
+default_keyfile    = pi-hole.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = pi-hole.asus.laptop
+commonName_default          = pi-hole.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = pi-hole.asus.laptop
+DNS.1   = pi-hole.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/nginx/sites-available/syncthing3757.beelink.server.conf b/etc/nginx/sites-available/syncthing3757.beelink.server.conf
index fc39879..b8e289e 100644
--- a/etc/nginx/sites-available/syncthing3757.beelink.server.conf
+++ b/etc/nginx/sites-available/syncthing3757.beelink.server.conf
@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = syncthing3757.asus.laptop.key
+default_keyfile    = syncthing3757.beelink.server.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = syncthing3757.asus.laptop
+commonName_default          = syncthing3757.beelink.server
 commonName_max              = 64
 
 [req_ext]
@@ -27,6 +27,6 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = syncthing3757.asus.laptop
+DNS.1   = syncthing3757.beelink.server
 DNS.10   = localhost
 DNS.11   = 127.0.0.1
diff --git a/etc/systemd/system/gogs-daemon.service b/etc/systemd/system/gogs-daemon.service
new file mode 100644
index 0000000..6b07a21
--- /dev/null
+++ b/etc/systemd/system/gogs-daemon.service
@@ -0,0 +1,30 @@
+[Unit]
+Description=Gogs
+After=syslog.target
+After=network.target
+
+[Service]
+# Modify these two values and uncomment them if you have
+# repos with lots of files and get an HTTP error 500 because
+# of that
+###
+#LimitMEMLOCK=infinity
+#LimitNOFILE=65535
+Type=simple
+User=gogs
+Group=gogs
+WorkingDirectory=/home/gogs/gogs
+ExecStart=/home/gogs/gogs/gogs web
+Restart=always
+Environment=USER=gogs HOME=/home/gogs
+
+# Some distributions may not support these hardening directives
+# If you cannot start the service due
+# to an unknown option, comment out the ones not supported by your version of systemd.
+ProtectSystem=full
+PrivateDevices=yes
+PrivateTmp=yes
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target