diff --git a/metadata/service/client/init.yml b/metadata/service/client/init.yml
new file mode 100644
index 0000000..deefeb0
--- /dev/null
+++ b/metadata/service/client/init.yml
@@ -0,0 +1,6 @@
+applications:
+  - rundeck
+parameters:
+  rundeck:
+    client:
+      enabled: true
diff --git a/metadata/service/common.yml b/metadata/service/common.yml
new file mode 100644
index 0000000..233451a
--- /dev/null
+++ b/metadata/service/common.yml
@@ -0,0 +1,6 @@
+parameters:
+  _param:
+    rundeck_runbook_user: runbook
+    rundeck_admin_username: admin
+    rundeck_admin_password: password
+    rundeck_admin_token: password
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 0524e89..d4c767c 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,12 +1,9 @@
 applications:
   - rundeck
 classes:
+  - service.rundeck.common
   - service.rundeck.support
 parameters:
-  _param:
-    rundeck_admin_username: admin
-    rundeck_admin_password: password
-    rundeck_admin_token: password
   rundeck:
     server:
       enabled: true