diff --git a/.devcontainer/.zshrc b/.devcontainer/.zshrc
deleted file mode 100644
index 415d1b8..0000000
--- a/.devcontainer/.zshrc
+++ /dev/null
@@ -1,111 +0,0 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
-
-# Path to your Oh My Zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
-
-# Set name of the theme to load --- if set to "random", it will
-# load a random theme each time Oh My Zsh is loaded, in which case,
-# to know which specific one was loaded, run: echo $RANDOM_THEME
-# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="gnzh"
-
-# Set list of themes to pick from when loading at random
-# Setting this variable when ZSH_THEME="devcontainers"
-# a theme from this variable instead of looking in $ZSH/themes/
-# If set to an empty array, this variable will have no effect.
-# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
-
-# Uncomment the following line to use case-sensitive completion.
-# CASE_SENSITIVE="true"
-
-# Uncomment the following line to use hyphen-insensitive completion.
-# Case-sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
-
-# Uncomment one of the following lines to change the auto-update behavior
-# zstyle ':omz:update' mode disabled  # disable automatic updates
-# zstyle ':omz:update' mode auto      # update automatically without asking
-# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
-
-# Uncomment the following line to change how often to auto-update (in days).
-# zstyle ':omz:update' frequency 13
-
-# Uncomment the following line if pasting URLs and other text is messed up.
-# DISABLE_MAGIC_FUNCTIONS="true"
-
-# Uncomment the following line to disable colors in ls.
-# DISABLE_LS_COLORS="true"
-
-# Uncomment the following line to disable auto-setting terminal title.
-# DISABLE_AUTO_TITLE="true"
-
-# Uncomment the following line to enable command auto-correction.
-# ENABLE_CORRECTION="true"
-
-# Uncomment the following line to display red dots whilst waiting for completion.
-# You can also set it to another string to have that shown instead of the default red dots.
-# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
-# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
-# COMPLETION_WAITING_DOTS="true"
-
-# Uncomment the following line if you want to disable marking untracked files
-# under VCS as dirty. This makes repository status check for large repositories
-# much, much faster.
-# DISABLE_UNTRACKED_FILES_DIRTY="true"
-
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# You can set one of the optional three formats:
-# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# or set a custom format using the strftime function format specifications,
-# see 'man strftime' for details.
-# HIST_STAMPS="mm/dd/yyyy"
-
-# Would you like to use another custom folder than $ZSH/custom?
-# ZSH_CUSTOM=/path/to/new-custom-folder
-
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=(git timer web-search ssh kubectl helm colorize zsh-autosuggestions fast-syntax-highlighting)
-ZSH_COLORIZE_TOOL=chroma
-
-source $ZSH/oh-my-zsh.sh
-
-# User configuration
-
-# export MANPATH="/usr/local/man:$MANPATH"
-
-# You may need to manually set your language environment
-# export LANG=en_US.UTF-8
-
-# Preferred editor for local and remote sessions
-# if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
-# else
-#   export EDITOR='nvim'
-# fi
-
-# Compilation flags
-# export ARCHFLAGS="-arch $(uname -m)"
-
-# Set personal aliases, overriding those provided by Oh My Zsh libs,
-# plugins, and themes. Aliases can be placed here, though Oh My Zsh
-# users are encouraged to define aliases within a top-level file in
-# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
-# - $ZSH_CUSTOM/aliases.zsh
-# - $ZSH_CUSTOM/macos.zsh
-# For a full list of active aliases, run `alias`.
-#
-# Example aliases
-# alias zshconfig="mate ~/.zshrc"
-# alias ohmyzsh="mate ~/.oh-my-zsh"
-DISABLE_AUTO_UPDATE=true
-DISABLE_UPDATE_PROMPT=true
-export FAST_HIGHLIGHT_CHROMA_PATH="/home/vscode/lib/chroma"
-export FAST_HIGHLIGHT_CHROMA=1
-export PATH=$PATH:/home/vscode/lib
-
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fed13d0..a45c99f 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,11 +2,10 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
 {
 	"name": "mylimbo-ansible-roles-dev",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/base:jammy",
-	"features": {
-		"ghcr.io/devcontainers-extra/features/ansible":  {},
-	},
+	"image": "oci.limbosolutions.com/public/devcontainers/devops:latest",
+	"runArgs": [
+		"--hostname=mylimbo-ansible-roles-dev"
+	],
 	// "features": {},
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
@@ -21,7 +20,7 @@
 	"remoteEnv": {
 	
 	},
-	"postCreateCommand": "bash .devcontainer/scripts/postCreate.sh",
+
 	"customizations": {
 		"vscode": {
 			"extensions": [
diff --git a/.devcontainer/scripts/postCreate.sh b/.devcontainer/scripts/postCreate.sh
deleted file mode 100644
index 098f105..0000000
--- a/.devcontainer/scripts/postCreate.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/zsh
-
-#setup chroma for zsh colorize
-mkdir -p ~/lib
-curl -Lo ~/lib/chroma https://github.com/alecthomas/chroma/releases/latest/download/chroma-linux-amd64
-chmod +x ~/lib/chroma
-
-git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/fast-syntax-highlighting
-git clone https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
-
-
diff --git a/roles/grafana_alloy/templates/config.alloy.j2 b/roles/grafana_alloy/templates/config.alloy.j2
index 894070e..1fa0059 100644
--- a/roles/grafana_alloy/templates/config.alloy.j2
+++ b/roles/grafana_alloy/templates/config.alloy.j2
@@ -3,30 +3,22 @@ prometheus.remote_write "prom_srv" {
     endpoint {
         url = "{{ prometheus.remote_write.endpoint.url }}"
     }
+
+  // global labels
+  external_labels = {
+    cluster     = sys.env("CLUSTER_NAME"),
+    zone        = sys.env("ZONE"),
+    job         = integrations/unix"
+  }
 }
 
 // metrics - scrape config
 prometheus.scrape "integrations_node_exporter" {
     scrape_interval = "15s"
-    targets    = discovery.relabel.integrations_node_exporter.output
+    targets    = prometheus.exporter.unix.integrations_node_exporter.targets
     forward_to = [prometheus.remote_write.prom_srv.receiver]
 }
 
-// metrics - relabel
-discovery.relabel "integrations_node_exporter" {
-targets = prometheus.exporter.unix.integrations_node_exporter.targets
-
-    rule {
-        target_label = "instance"
-        replacement  = constants.hostname
-    }
-
-    rule {
-        target_label = "job"
-        replacement = "node-exporter"
-    }
-}
-
 
 // metrics - node exporter
 prometheus.exporter.unix "integrations_node_exporter" {
@@ -62,6 +54,7 @@ loki.source.journal "logs_journal_scrape" {
     forward_to    = [loki.write.loki_srv.receiver]
 
     labels = {
+        job  = "integrations/journald",
         host = "{{ inventory_hostname }}",
         {% if loki.labels is defined and loki.labels %}
         {% for key, value in loki.labels.items() %}