diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d2fa1f..92c0e5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 3.0.6
+- `--tag` option is optional while bootstrapping if you already have a configured `task_definition`
+
+# 3.0.5
+- Make `update_service` work correctly for services configured with load balancers
+
+# 3.0.4
+- `--tag` option required during bootstrapping
+
 # 3.0.3
 - update of GLI specifications, adding on to 3.0.2
 
diff --git a/lib/broadside/ecs/ecs_deploy.rb b/lib/broadside/ecs/ecs_deploy.rb
index e6f068f..900a46f 100644
--- a/lib/broadside/ecs/ecs_deploy.rb
+++ b/lib/broadside/ecs/ecs_deploy.rb
@@ -28,6 +28,7 @@ def bootstrap
         info "Task definition for #{family} already exists."
       else
         raise ConfigurationError, "No :task_definition_config for #{family}" unless @target.task_definition_config
+        raise ConfigurationError, 'Bootstrapping a task_definition requires a --tag option' unless @target.tag
         info "Creating an initial task definition for '#{family}' from the config..."
 
         EcsManager.ecs.register_task_definition(
diff --git a/lib/broadside/gli/commands.rb b/lib/broadside/gli/commands.rb
index 5579fbc..6d30208 100644
--- a/lib/broadside/gli/commands.rb
+++ b/lib/broadside/gli/commands.rb
@@ -24,7 +24,10 @@ def add_command_flags(cmd)
 
 desc 'Bootstrap your service and task definition from the configured definition.'
 command :bootstrap do |bootstrap|
-  add_tag_flag(bootstrap)
+  bootstrap.desc 'Optionally configured tag - without it you cannot bootstrap a task_definition'
+  bootstrap.arg_name 'TAG'
+  bootstrap.flag 'tag', :optional
+
   add_target_flag(bootstrap)
 
   bootstrap.action do |_, options, _|
diff --git a/lib/broadside/version.rb b/lib/broadside/version.rb
index 913ed39..84242cc 100644
--- a/lib/broadside/version.rb
+++ b/lib/broadside/version.rb
@@ -1,3 +1,3 @@
 module Broadside
-  VERSION = '3.0.5'.freeze
+  VERSION = '3.0.6'.freeze
 end