diff --git a/backend/app_sdk/app_base.py b/backend/app_sdk/app_base.py
index 3c42c42e..50c17656 100644
--- a/backend/app_sdk/app_base.py
+++ b/backend/app_sdk/app_base.py
@@ -2527,7 +2527,7 @@ class AppBase:
                     check, sourcevalue, is_loop = parse_params(action, fullexecution, condition["source"], self)
                     if check:
                         continue
-                        return False, {"success": False, "reason": "Failed condition (1): %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
+                        return False, {"success": False, "reason": "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
 
                     #sourcevalue = sourcevalue.encode("utf-8")
                     sourcevalue = parse_wrapper_start(sourcevalue, self)
@@ -2536,7 +2536,7 @@ class AppBase:
                     check, destinationvalue, is_loop = parse_params(action, fullexecution, condition["destination"], self)
                     if check:
                         continue
-                        return False, {"success": False, "reason": "Failed condition (2): %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
+                        return False, {"success": False, "reason": "Failed condition: %s %s %s because %s" % (sourcevalue, condition["condition"]["value"], destinationvalue, check)}
 
                     #destinationvalue = destinationvalue.encode("utf-8")
                     destinationvalue = parse_wrapper_start(destinationvalue, self)
diff --git a/backend/app_sdk/build.sh b/backend/app_sdk/build.sh
index 22416f8b..c0c768ec 100644
--- a/backend/app_sdk/build.sh
+++ b/backend/app_sdk/build.sh
@@ -2,7 +2,7 @@
 
 ### DEFAULT 
 NAME=shuffle-app_sdk
-VERSION=0.9.70
+VERSION=1.0.0
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
 docker build . -f Dockerfile -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:nightly
diff --git a/backend/go-app/go.mod b/backend/go-app/go.mod
index 25119c40..a2dfd189 100644
--- a/backend/go-app/go.mod
+++ b/backend/go-app/go.mod
@@ -2,7 +2,7 @@ module main
 
 go 1.16
 
-replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
+//replace github.com/shuffle/shuffle-shared => ../../../shuffle-shared
 
 //replace github.com/frikky/kin-openapi => ../../../../git/kin-openapi
 //replace github.com/frikky/go-elasticsearch => ../../../../git/go-elasticsearch
@@ -24,7 +24,7 @@ require (
 	github.com/h2non/filetype v1.1.3
 	github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da // indirect
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.2.29
+	github.com/shuffle/shuffle-shared v0.2.38
 	go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
 	golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce
 	google.golang.org/api v0.65.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 7353a12c..d177ea2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
   frontend:
-    #build: ./frontend
+    build: ./frontend
     image: ghcr.io/frikky/shuffle-frontend:nightly
     container_name: shuffle-frontend
     hostname: shuffle-frontend
@@ -16,7 +16,7 @@ services:
     depends_on:
       - backend
   backend:
-    build: ./backend
+    #build: ./backend
     image: ghcr.io/frikky/shuffle-backend:nightly
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
diff --git a/frontend/package.json b/frontend/package.json
index e7ea8871..55e61c59 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shuffler",
   "homepage": "https://shuffler.io",
-  "version": "0.9.61",
+  "version": "1.0.0",
   "private": true,
   "dependencies": {
     "@babel/core": "^7.15.8",
@@ -54,6 +54,7 @@
     "react-device-detect": "^1.9.10",
     "react-dom": "^16.14.0",
     "react-draggable": "^3.3.2",
+    "react-driftjs": "^1.2.2",
     "react-dropzone": "^10.1.10",
     "react-ga": "^2.7.0",
     "react-iframe": "^1.8.0",
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index e1b800a4..a4b5e132 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -310,7 +310,7 @@ const App = (message, props) => {
 						<Drift 
 							appId="zfk9i7w3yizf" 
 							attributes={{
-								name: userdata.username === undefined || userdata.username === null ? "OSS user" : `${userdata.username} - OSS`,
+								name: userdata.username === undefined || userdata.username === null ? "OSS user" : `OSS ${userdata.username}`,
 							}}
 							eventHandlers={[
 								{ 
diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh
index eff06ee0..fe360759 100644
--- a/functions/onprem/orborus/build.sh
+++ b/functions/onprem/orborus/build.sh
@@ -1,5 +1,5 @@
 NAME=shuffle-orborus
-VERSION=0.9.71
+VERSION=1.0.0
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force