diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fe18a55..04eaa833 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## v0.6.4 (2021-06-17)
+
+#### :bug: Bug Fix
+* `@glimmerx/babel-preset`, `@glimmerx/blueprint`, `@glimmerx/component`, `@glimmerx/core`, `@glimmerx/helper`, `@glimmerx/modifier`, `@glimmerx/service`, `@glimmerx/ssr`, `examples`
+  * [#119](https://github.com/glimmerjs/glimmer-experimental/pull/119) Bump to glimmerjs to beta.17 ([@chiragpat](https://github.com/chiragpat))
+* `@glimmerx/babel-preset`
+  * [#109](https://github.com/glimmerjs/glimmer-experimental/pull/109) bug repro: Association does not happen ([@chadhietala](https://github.com/chadhietala))
+
+#### Committers: 2
+- Chad Hietala ([@chadhietala](https://github.com/chadhietala))
+- Chirag Patel ([@chiragpat](https://github.com/chiragpat))
+
+
 ## v0.6.3 (2021-04-27)
 
 #### :bug: Bug Fix
diff --git a/packages/@glimmerx/babel-preset/package.json b/packages/@glimmerx/babel-preset/package.json
index 30c09b56..6d46a51f 100644
--- a/packages/@glimmerx/babel-preset/package.json
+++ b/packages/@glimmerx/babel-preset/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/babel-preset",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "GlimmerX Babel Preset",
   "repository": "https://github.com/glimmerjs/glimmer.js",
   "author": "Tom Dale <tom@tomdale.net>",
diff --git a/packages/@glimmerx/blueprint/package.json b/packages/@glimmerx/blueprint/package.json
index 199ae0e3..28283b29 100644
--- a/packages/@glimmerx/blueprint/package.json
+++ b/packages/@glimmerx/blueprint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/blueprint",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Ember CLI blueprint for initializing a new GlimmerX application.",
   "main": "index.js",
   "scripts": {
diff --git a/packages/@glimmerx/compiler/package.json b/packages/@glimmerx/compiler/package.json
index 7f5bc6a3..221944d5 100644
--- a/packages/@glimmerx/compiler/package.json
+++ b/packages/@glimmerx/compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/compiler",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Compiler functionality",
   "main": "index.js",
   "repository": "https://github.com/glimmerjs/glimmer-experimental",
diff --git a/packages/@glimmerx/component/package.json b/packages/@glimmerx/component/package.json
index ede0c446..b5e6d2b0 100644
--- a/packages/@glimmerx/component/package.json
+++ b/packages/@glimmerx/component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/component",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Base component class",
   "keywords": [
     "ember-addon"
diff --git a/packages/@glimmerx/core/package.json b/packages/@glimmerx/core/package.json
index 8485ea2f..1c0dc47a 100644
--- a/packages/@glimmerx/core/package.json
+++ b/packages/@glimmerx/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/core",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Core rendering functionality",
   "main": "dist/commonjs/index.js",
   "module": "dist/modules/index.js",
diff --git a/packages/@glimmerx/eslint-plugin/package.json b/packages/@glimmerx/eslint-plugin/package.json
index 682d96e8..ac9322ce 100644
--- a/packages/@glimmerx/eslint-plugin/package.json
+++ b/packages/@glimmerx/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/eslint-plugin",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "ESLint Plugin to enable and streamline glimmerx development",
   "main": "index.js",
   "repository": "https://github.com/glimmerjs/glimmer-experimental",
diff --git a/packages/@glimmerx/helper/package.json b/packages/@glimmerx/helper/package.json
index 2db42d92..0718dad0 100644
--- a/packages/@glimmerx/helper/package.json
+++ b/packages/@glimmerx/helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/helper",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Helper Functionality",
   "keywords": [
     "ember-addon"
@@ -20,7 +20,7 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@glimmerx/core": "0.6.3",
+    "@glimmerx/core": "0.6.4",
     "@glimmer/helper": "2.0.0-beta.17",
     "@glimmer/interfaces": "0.77.3",
     "ember-cli-babel": "7.26.2"
diff --git a/packages/@glimmerx/modifier/package.json b/packages/@glimmerx/modifier/package.json
index fefad14b..562a0979 100644
--- a/packages/@glimmerx/modifier/package.json
+++ b/packages/@glimmerx/modifier/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/modifier",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Modifier Functionality",
   "keywords": [
     "ember-addon"
diff --git a/packages/@glimmerx/service/package.json b/packages/@glimmerx/service/package.json
index 964c73b4..eb924501 100644
--- a/packages/@glimmerx/service/package.json
+++ b/packages/@glimmerx/service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/service",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Services Functionality",
   "keywords": [
     "ember-addon"
@@ -20,7 +20,7 @@
     "build": "webpack"
   },
   "dependencies": {
-    "@glimmerx/core": "0.6.3",
+    "@glimmerx/core": "0.6.4",
     "@glimmer/debug": "2.0.0-beta.17",
     "@glimmer/env": "^0.1.7",
     "ember-cli-babel": "7.26.2"
diff --git a/packages/@glimmerx/ssr/package.json b/packages/@glimmerx/ssr/package.json
index 08bbf5ae..4e11bde9 100644
--- a/packages/@glimmerx/ssr/package.json
+++ b/packages/@glimmerx/ssr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/ssr",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "SSR functionality",
   "main": "dist/commonjs/index.js",
   "module": "dist/modules/index.js",
@@ -17,7 +17,7 @@
   "dependencies": {
     "@glimmer/interfaces": "0.77.3",
     "@glimmer/ssr": "2.0.0-beta.17",
-    "@glimmerx/core": "^0.6.3"
+    "@glimmerx/core": "^0.6.4"
   },
   "volta": {
     "node": "12.10.0",
diff --git a/packages/@glimmerx/storybook/package.json b/packages/@glimmerx/storybook/package.json
index cb913811..e7be9ad4 100644
--- a/packages/@glimmerx/storybook/package.json
+++ b/packages/@glimmerx/storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/storybook",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "storybook for glimmerjs",
   "keywords": [
     "storybook",
@@ -52,10 +52,10 @@
     "global": "^4.4.0"
   },
   "peerDependencies": {
-    "@glimmerx/babel-preset": "^0.6.3",
-    "@glimmerx/component": "^0.6.3",
-    "@glimmerx/core": "^0.6.3",
-    "@glimmerx/webpack-loader": "^0.6.3",
+    "@glimmerx/babel-preset": "^0.6.4",
+    "@glimmerx/component": "^0.6.4",
+    "@glimmerx/core": "^0.6.4",
+    "@glimmerx/webpack-loader": "^0.6.4",
     "babel-loader": "^8.1.0"
   },
   "engines": {
diff --git a/packages/@glimmerx/webpack-loader/package.json b/packages/@glimmerx/webpack-loader/package.json
index 6952fbb1..a8caaf8f 100644
--- a/packages/@glimmerx/webpack-loader/package.json
+++ b/packages/@glimmerx/webpack-loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@glimmerx/webpack-loader",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "GlimmerX Webpack Loader",
   "repository": "https://github.com/glimmerjs/glimmer.js",
   "author": "Tom Dale <tom@tomdale.net>",
@@ -16,7 +16,7 @@
     "schema-utils": "3.0.0"
   },
   "peerDependencies": {
-    "@glimmerx/babel-preset": "^0.6.3",
+    "@glimmerx/babel-preset": "^0.6.4",
     "babel-plugin-htmlbars-inline-precompile": "^5.2.1"
   },
   "devDependencies": {
diff --git a/packages/examples/basic-addon/package.json b/packages/examples/basic-addon/package.json
index 8163b9d2..827e0e85 100644
--- a/packages/examples/basic-addon/package.json
+++ b/packages/examples/basic-addon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basic-addon",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "The default blueprint for ember-cli addons.",
   "private": true,
   "keywords": [
@@ -24,17 +24,17 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@glimmerx/component": "^0.6.3",
-    "@glimmerx/helper": "^0.6.3",
-    "@glimmerx/modifier": "^0.6.3",
-    "@glimmerx/service": "^0.6.3",
+    "@glimmerx/component": "^0.6.4",
+    "@glimmerx/helper": "^0.6.4",
+    "@glimmerx/modifier": "^0.6.4",
+    "@glimmerx/service": "^0.6.4",
     "ember-cli-babel": "7.26.2",
     "ember-cli-htmlbars": "^5.7.1"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
     "@glimmer/tracking": "2.0.0-beta.17",
-    "@glimmerx/eslint-plugin": "^0.6.3",
+    "@glimmerx/eslint-plugin": "^0.6.4",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "ember-auto-import": "^1.5.3",
diff --git a/packages/examples/basic/package.json b/packages/examples/basic/package.json
index 3ea2ac0d..3ca3862a 100644
--- a/packages/examples/basic/package.json
+++ b/packages/examples/basic/package.json
@@ -1,6 +1,6 @@
 {
   "name": "basic-example-app",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Example application using @glimmerx packages",
   "main": "dist/commonjs/index.js",
   "repository": "https://github.com/glimmerjs/glimmer-experimental",
@@ -13,12 +13,12 @@
     "storybook": "start-storybook -p 6006"
   },
   "dependencies": {
-    "@glimmerx/core": "^0.6.3",
-    "basic-addon": "0.6.3"
+    "@glimmerx/core": "^0.6.4",
+    "basic-addon": "0.6.4"
   },
   "devDependencies": {
     "@glimmer/interfaces": "0.77.3",
-    "@glimmerx/storybook": "^0.6.3",
+    "@glimmerx/storybook": "^0.6.4",
     "@storybook/addon-essentials": "^6.1.21"
   },
   "volta": {
diff --git a/packages/examples/ember-app/package.json b/packages/examples/ember-app/package.json
index fc4c9742..95b3a9bb 100644
--- a/packages/examples/ember-app/package.json
+++ b/packages/examples/ember-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-app",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "private": true,
   "description": "Small description for ember-app goes here",
   "repository": "",
diff --git a/packages/examples/partial-rehydration/package.json b/packages/examples/partial-rehydration/package.json
index a0592b06..48268f1b 100644
--- a/packages/examples/partial-rehydration/package.json
+++ b/packages/examples/partial-rehydration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "partial-rehydration-example-app",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Example application using partial rehydration with @glimmerx packages",
   "main": "dist/commonjs/index.js",
   "repository": "https://github.com/glimmerjs/glimmer-experimental",
@@ -9,10 +9,10 @@
   "private": true,
   "scripts": {},
   "dependencies": {
-    "@glimmerx/core": "^0.6.3",
-    "@glimmerx/component": "^0.6.3",
-    "@glimmerx/modifier": "^0.6.3",
-    "@glimmerx/ssr": "^0.6.3"
+    "@glimmerx/core": "^0.6.4",
+    "@glimmerx/component": "^0.6.4",
+    "@glimmerx/modifier": "^0.6.4",
+    "@glimmerx/ssr": "^0.6.4"
   },
   "volta": {
     "node": "12.10.0",
diff --git a/packages/examples/playground/package.json b/packages/examples/playground/package.json
index 46bbbc26..864bcb0d 100644
--- a/packages/examples/playground/package.json
+++ b/packages/examples/playground/package.json
@@ -1,6 +1,6 @@
 {
   "name": "glimmerx-playground",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "A brand new Glimmer app.",
   "directories": {
     "doc": "doc",
@@ -19,14 +19,14 @@
     "@babel/preset-env": "^7.9.0",
     "@babel/preset-typescript": "^7.9.0",
     "@glimmer/env": "^0.1.7",
-    "@glimmerx/babel-preset": "^0.6.3",
-    "@glimmerx/component": "^0.6.3",
-    "@glimmerx/core": "^0.6.3",
-    "@glimmerx/eslint-plugin": "^0.6.3",
-    "@glimmerx/helper": "^0.6.3",
-    "@glimmerx/modifier": "^0.6.3",
-    "@glimmerx/service": "^0.6.3",
-    "@glimmerx/webpack-loader": "^0.6.3",
+    "@glimmerx/babel-preset": "^0.6.4",
+    "@glimmerx/component": "^0.6.4",
+    "@glimmerx/core": "^0.6.4",
+    "@glimmerx/eslint-plugin": "^0.6.4",
+    "@glimmerx/helper": "^0.6.4",
+    "@glimmerx/modifier": "^0.6.4",
+    "@glimmerx/service": "^0.6.4",
+    "@glimmerx/webpack-loader": "^0.6.4",
     "@types/qunit": "^2.9.1",
     "@typescript-eslint/eslint-plugin": "^4.18.0",
     "@typescript-eslint/parser": "^4.18.0",
diff --git a/packages/examples/rehydration/package.json b/packages/examples/rehydration/package.json
index ae9b01a1..03b741d2 100644
--- a/packages/examples/rehydration/package.json
+++ b/packages/examples/rehydration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rehydration-example-app",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Example application using rehydration with @glimmerx packages",
   "main": "dist/commonjs/index.js",
   "repository": "https://github.com/glimmerjs/glimmer-experimental",
@@ -9,10 +9,10 @@
   "private": true,
   "scripts": {},
   "dependencies": {
-    "@glimmerx/core": "^0.6.3",
-    "@glimmerx/component": "^0.6.3",
-    "@glimmerx/modifier": "^0.6.3",
-    "@glimmerx/ssr": "^0.6.3"
+    "@glimmerx/core": "^0.6.4",
+    "@glimmerx/component": "^0.6.4",
+    "@glimmerx/modifier": "^0.6.4",
+    "@glimmerx/ssr": "^0.6.4"
   },
   "volta": {
     "node": "12.10.0",