diff --git a/.github/workflows/dockerpublish.yml b/.github/workflows/dockerpublish.yml
index 87cefa9..1c200f2 100644
--- a/.github/workflows/dockerpublish.yml
+++ b/.github/workflows/dockerpublish.yml
@@ -59,7 +59,7 @@ jobs:
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
           
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
+          [ "$VERSION" == "master" ] && VERSION=0.0.1-SNAPSHOT
           
           TIMESTAMP=$(date +'%Y-%m-%d')
           echo date=$TIMESTAMP > commit.properties
@@ -90,7 +90,7 @@ jobs:
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
+          [ "$VERSION" == "master" ] && VERSION=0.0.1-SNAPSHOT
 
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
diff --git a/src/resolvers.js b/src/resolvers.js
index 891db97..674729b 100644
--- a/src/resolvers.js
+++ b/src/resolvers.js
@@ -255,7 +255,7 @@ const resolvers = {
         profileId,
         locationId,
         name,
-        baseMacAddress,
+        baseMacAddress: { addressAsString: baseMacAddress },
         latitude,
         longitude,
         serial,