diff --git a/app/Drivers/DatabaseDriver.php b/app/Drivers/DatabaseDriver.php
index b1597b5..b04b0e0 100644
--- a/app/Drivers/DatabaseDriver.php
+++ b/app/Drivers/DatabaseDriver.php
@@ -15,4 +15,8 @@ abstract class DatabaseDriver extends Driver
         ?string $containerId = null,
         ?array $credentials = null,
     );
+
+    abstract public function createUser(string $user, string $password): string;
+
+    // abstract public function createDatabase(string $db, string $user): string;
 }
diff --git a/app/Drivers/Postgres/Postgres17Driver.php b/app/Drivers/Postgres/Postgres17Driver.php
index bd206f7..200ad71 100644
--- a/app/Drivers/Postgres/Postgres17Driver.php
+++ b/app/Drivers/Postgres/Postgres17Driver.php
@@ -55,7 +55,7 @@ class Postgres17Driver extends DatabaseDriver
                 }
             ),
             new Step(
-                name: 'Configure firewall',
+                name: 'Configure firewall', // @todo this should create a Firewallrule
                 script: 'ufw allow 5432/tcp || true',
             ),
         ]);
@@ -69,4 +69,9 @@ class Postgres17Driver extends DatabaseDriver
             'db' => 'keystone',
         ];
     }
+
+    public function createUser(string $user, string $password): string
+    {
+        return "psql -U {$this->credentials['user']} -d {$this->credentials['db']} -c \"CREATE USER {$user} WITH PASSWORD '{$password}';\"";
+    }
 }
diff --git a/app/Http/Controllers/EnvironmentController.php b/app/Http/Controllers/EnvironmentController.php
index 070ed4b..1b943fd 100644
--- a/app/Http/Controllers/EnvironmentController.php
+++ b/app/Http/Controllers/EnvironmentController.php
@@ -16,7 +16,13 @@ class EnvironmentController extends Controller
         return inertia('environments/Show', [
             'environment' => $environment,
             'servers' => inertia()->optional(function () use ($environment) {
-                return $environment->application?->organisation?->servers->where('status', ServerStatus::ACTIVE)?->values() ?? [];
+                return $environment
+                    ->application
+                    ?->organisation
+                    ?->servers()
+                    ->where('status', ServerStatus::ACTIVE)
+                    ->with('services')
+                    ->get() ?? [];
             }),
         ]);
     }
diff --git a/resources/js/components/RadioButton.vue b/resources/js/components/RadioButton.vue
index 1c16fab..3d9723d 100644
--- a/resources/js/components/RadioButton.vue
+++ b/resources/js/components/RadioButton.vue
@@ -15,7 +15,7 @@ function onChange(event) {
 
 <template>
     <label
-        class="relative rounded-lg border-2 border-white/20 px-3 py-1 has-[:checked]:border-white has-[:disabled]:opacity-40"
+        class="relative rounded-lg border-2 dark:border-white/20 px-3 py-1 dark:has-[:checked]:border-white border-black/20 has-[:checked]:border-black has-[:disabled]:opacity-40"
     >
         <input
             type="radio"
diff --git a/resources/js/components/ServerSelector.vue b/resources/js/components/ServerSelector.vue
index 949bdfc..09145f1 100644
--- a/resources/js/components/ServerSelector.vue
+++ b/resources/js/components/ServerSelector.vue
@@ -1,19 +1,29 @@
 <script setup>
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
 import { Deferred, router } from '@inertiajs/vue3';
+import { LoaderCircleIcon } from 'lucide-vue-next';
 import { ref, watch } from 'vue';
 import { Card } from './ui/card';
-import { LoaderCircleIcon } from 'lucide-vue-next';
+import ServiceCategory from '@/enums/ServiceCategory';
 
 const props = defineProps({
     servers: {
         type: Array,
         required: false,
     },
+    serviceCategory: {
+        type: String,
+        required: false,
+        validate: (value) => {
+            return Object.keys(ServiceCategory).includes(value);
+        }
+    }
 });
 
 const isOpen = ref(false);
 
+defineEmits(['select']);
+
 watch(isOpen, () => {
     if (isOpen.value && props.servers === undefined) {
         router.reload({
@@ -36,28 +46,32 @@ watch(isOpen, () => {
                     <Deferred data="servers">
                         <template #fallback>
                             <div class="flex justify-center py-4">
-                                <LoaderCircleIcon class="text-muted-foreground size-6 animate-spin" />
+                                <LoaderCircleIcon class="size-6 animate-spin text-muted-foreground" />
                             </div>
                         </template>
                         <Card
                             v-for="(server, serverIndex) in servers"
                             :key="`serverPicker-${server.id}`"
                             :data-index="serverIndex"
-                            class="flex gap-4 p-2"
+                            class="group flex gap-4 p-2 justify-between text-muted-foreground hover:text-foreground transition"
                             :class="{
                                 'rounded-b-none': serverIndex !== servers.length - 1,
                                 'rounded-t-none': serverIndex !== 0,
                                 'border-b-0': serverIndex !== servers.length - 1,
                             }"
+                            @click="
+                                $emit('select', server);
+                                isOpen = false;
+                            "
                         >
-                            <div>{{ server.name }}</div>
-                            <div></div>
+                            <div class="cursor-default text-sm">{{ server.name }}</div>
+                            <div v-if="serviceCategory" class="text-xs">{{ !!server.services.filter((s) => s.category === serviceCategory).length ? 'Has Gateway' : 'No Gateway Installed' }}</div>
                         </Card>
                         <Card v-if="servers.length === 0" class="p-2 text-sm text-muted-foreground"> No servers available </Card>
                     </Deferred>
                 </div>
             </DialogHeader>
-            <DialogFooter> Dismiss </DialogFooter>
+            <!-- <DialogFooter> Dismiss </DialogFooter> -->
         </DialogContent>
     </Dialog>
 </template>
diff --git a/resources/js/pages/environments/Show.vue b/resources/js/pages/environments/Show.vue
index f29b36c..5fdaf0d 100644
--- a/resources/js/pages/environments/Show.vue
+++ b/resources/js/pages/environments/Show.vue
@@ -1,8 +1,9 @@
-<script setup lang="ts">
+<script setup>
 import ServerSelector from '@/components/ServerSelector.vue';
 import { Card } from '@/components/ui/card';
+import ServiceCategory from '@/enums/ServiceCategory';
 import AppLayout from '@/layouts/AppLayout.vue';
-import { Head } from '@inertiajs/vue3';
+import { Head, router, usePage } from '@inertiajs/vue3';
 import { PlusIcon } from 'lucide-vue-next';
 
 defineProps({
@@ -15,6 +16,20 @@ defineProps({
         required: false,
     }
 });
+
+function selectServer(server, serviceCategory = null) {
+    if (serviceCategory) {
+        if (server.services?.find((s) => s.category === serviceCategory)) {
+            // service is installed
+            return;
+        } else {
+            router.visit(route('servers.show', {
+                organisation: usePage().props.organisation.id,
+                server: server.id,
+            }));
+        }
+    }
+}
 </script>
 
 <template>
@@ -35,6 +50,10 @@ defineProps({
             },
             {
                 title: 'Environments',
+                href: route('applications.show', {
+                    organisation: $page.props.organisation.id,
+                    application: environment.application.id,
+                }),
             },
             {
                 title: environment.name,
@@ -49,7 +68,7 @@ defineProps({
         <div class="flex h-full flex-1 flex-col gap-4 rounded-xl p-4">
             <Card class="pattern-graph-paper grid grid-cols-3 gap-6 p-6">
                 <div class="space-y-2">
-                    <ServerSelector :servers="servers">
+                    <ServerSelector :servers="servers" :service-category="ServiceCategory.GATEWAY" @select="selectServer($event, ServiceCategory.GATEWAY)">
                         <template #trigger>
                             <Card class="group flex select-none items-center gap-2 bg-card/30 p-4 text-sm backdrop-blur-sm">
                                 <PlusIcon class="size-4 opacity-50" />
diff --git a/resources/js/pages/servers/Show.vue b/resources/js/pages/servers/Show.vue
index f82d048..af6e3bd 100644
--- a/resources/js/pages/servers/Show.vue
+++ b/resources/js/pages/servers/Show.vue
@@ -8,7 +8,7 @@ import { useCycleList, useInterval } from '@vueuse/core';
 import { DatabaseIcon, Layers2Icon, LoaderCircleIcon, PlusIcon } from 'lucide-vue-next';
 import { watch } from 'vue';
 
-const props = defineProps({
+defineProps({
     server: {
         type: Object,
         required: true,