diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 331c532..95b3eec 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -27,9 +27,14 @@ jobs:
             exit 1
           fi
 
+          # Get version from package.json
+          VERSION=$(node -p "require('./package.json').version")
+
           cat > .env.production <<EOF
           VITE_FLATTASTIC_API_KEY=${VITE_FLATTASTIC_API_KEY}
           VITE_HA_TOKEN=${VITE_HA_TOKEN}
+          VITE_APP_VERSION=${VERSION}
+          VITE_APP_ENV=production
           EOF
         env:
           VITE_FLATTASTIC_API_KEY: ${{ secrets.VITE_FLATTASTIC_API_KEY }}
diff --git a/Dockerfile b/Dockerfile
index 7837ff8..bd83f14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,11 @@
 FROM nginx:alpine
+
+# Set production environment
+ENV VITE_APP_ENV=production
+
 COPY ./dist /usr/share/nginx/html
 COPY nginx.conf /etc/nginx/nginx.conf
+
 EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/src/App.tsx b/src/App.tsx
index 3c9e975..e0debd2 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -8,13 +8,17 @@ import {
 import Dashboard from "@/components/Dashboard/Dashboard";
 
 function App() {
-    if (window.location.hostname === "localhost") {
+    const isProduction = import.meta.env.PROD;
+
+    if (isProduction) {
+        console.debug("Initializing Faro environment...");
+
         initializeFaro({
             url: "http://localhost:12347/collect",
             app: {
                 name: "monitor-im-flur",
-                version: "0.0.1",
-                environment: "development",
+                version: import.meta.env.VITE_APP_VERSION || "0.0.1",
+                environment: "production",
             },
             instrumentations: [
                 ...getWebInstrumentations(),