diff --git a/manifests/ubuntu.pp b/manifests/ubuntu.pp
index 32e5bc4a..cd8e63e0 100644
--- a/manifests/ubuntu.pp
+++ b/manifests/ubuntu.pp
@@ -37,7 +37,7 @@
   #
   # Also, using $::apt_agent6_beta_repo to access fact instead of
   # $facts hash - for compatibility with puppet3.x default behavior
-  if $::apt_agent6_beta_repo and $agent_version == 'latest' {
+  if str2bool("$::apt_agent6_beta_repo") and $agent_version == 'latest' {
     exec { 'datadog_apt-get_remove_agent6':
       command     => '/usr/bin/apt-get remove -y -q datadog-agent',
     }
@@ -50,7 +50,7 @@
     }
   }
 
-  if $::apt_agent6_beta_repo {
+  if str2bool("$::apt_agent6_beta_repo") {
     file { '/etc/apt/sources.list.d/datadog-beta.list':
       ensure => absent,
     }