diff --git a/doc/sql/query.ebnf b/doc/sql/query.ebnf
index 9da4a66c3c1362a776969fa5b078c7a5933b6e11..80cf51be144760facfcb1825803d5c61a1de2a40 100644
--- a/doc/sql/query.ebnf
+++ b/doc/sql/query.ebnf
@@ -147,7 +147,7 @@ create_table   ::= 'CREATE' 'TABLE' table
                        (',' 'PRIMARY' 'KEY' '(' column (',' column)* ')')?
                    ')'
                    ('USING' ('MEMTX' | 'VINYL'))?
-                   ('DISTRIBUTED' (('BY' '(' column (',' column)*  ')' ('ON' 'TIER' '(' tier ')')?) | 'GLOBALLY'))
+                   ('DISTRIBUTED' (('BY' '(' column (',' column)*  ')' ('IN' 'TIER' tier)?) | 'GLOBALLY'))
 create_user    ::= 'CREATE' 'USER' user 'WITH'? 'PASSWORD' "'" password "'"
                    ('USING' ('CHAP-SHA1' | 'LDAP' | 'MD5'))?
 alter_user     ::= 'ALTER' 'USER' user
diff --git a/sbroad-core/src/frontend/sql/query.pest b/sbroad-core/src/frontend/sql/query.pest
index 3b12d6c23f8b975ab7ccc722ab681a87eab92fe7..22c5bb0a387e3ffd33ee7f6aa0a045b7bd6e5f26 100644
--- a/sbroad-core/src/frontend/sql/query.pest
+++ b/sbroad-core/src/frontend/sql/query.pest
@@ -74,7 +74,7 @@ DDL = _{ CreateTable | DropTable | CreateIndex | DropIndex
         Distribution = { ^"distributed" ~ (Global | Sharding) }
         Global = { ^"globally" }
         Sharding = { ^"by" ~ "(" ~ Identifier ~ ("," ~ Identifier)* ~ ")" ~ Tier? }
-        Tier = { ^"on" ~ ^"tier" ~ "(" ~ Identifier ~ ")" }
+        Tier = { ^"in" ~ ^"tier" ~ Identifier }
     DropTable = { ^"drop" ~ ^"table" ~ Table ~ TimeoutOption? }
 
     CreateProc = {