diff --git a/bin/lncli b/bin/lncli
index 3de018f..67753c0 100755
--- a/bin/lncli
+++ b/bin/lncli
@@ -13,7 +13,7 @@ CITADEL_ROOT="$(readlink -f $(dirname "${BASH_SOURCE[0]}")/..)"
 result=$(docker compose \
   --file "${CITADEL_ROOT}/docker-compose.yml" \
   --env-file "${CITADEL_ROOT}/.env" \
-  exec lnd lncli "$@")
+  exec lightning lncli "$@")
 
 # We need to echo with quotes to preserve output formatting
 echo "$result"
diff --git a/docker-compose.yml b/docker-compose.yml
index ef2ec1f..4cceb94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -100,7 +100,7 @@ services:
         ipv4_address: $LND_IP
   dashboard:
     container_name: dashboard
-    image: ghcr.io/runcitadel/dashboard:v0.0.13@sha256:86be4a105e9599163866d2e4f79c4d4ab9725ce56d71d7d7341e4d0ab3441b54
+    image: ghcr.io/runcitadel/dashboard:v0.0.15@sha256:a2cf5ad79367fb083db0f61e5a296aafee655c99af0c228680644c248ec674a5
     restart: on-failure
     stop_grace_period: 1m30s
     networks:
diff --git a/services/manage.py b/services/manage.py
index 3e9a3dc..c965b2d 100755
--- a/services/manage.py
+++ b/services/manage.py
@@ -31,6 +31,21 @@ args = parser.parse_args()
 # Function to install a service
 # To install it, read the service's YAML file (nodeRoot/services/name.yml) and add it to the main compose file (nodeRoot/docker-compose.yml)
 def setService(name, implementation):
+    # Get all available services
+    services = next(os.walk(os.path.join(nodeRoot, "services")))[1]
+
+    if not name in services:
+        print("\"{}\" is not a valid service.".format(name))
+        exit(1)
+
+    # Get all available implementations
+    implementations = next(os.walk(os.path.join(nodeRoot, "services", name)), (None, None, []))[2]
+    implementations = [x.split('.')[0] for x in implementations]
+
+    if not implementation in implementations:
+        print("\"{}\" is not a valid implementation.".format(implementation))
+        exit(1)
+
     # Read the YAML file
     with open(os.path.join(nodeRoot, "services", name, implementation + ".yml"), 'r') as stream:
         service = yaml.safe_load(stream)