diff --git a/hosting/templates/hosting/bill_detail.html b/hosting/templates/hosting/bill_detail.html
index f871e5ed..11472039 100644
--- a/hosting/templates/hosting/bill_detail.html
+++ b/hosting/templates/hosting/bill_detail.html
@@ -49,8 +49,8 @@
                     <tr>
                         <td>{{ vm.name }}</td>
                         <td><span class="pull-right">{{ vm.cores }}</span></td>
-                        <td><span class="pull-right">{{ vm.memory|floatformat }} GiB </span></td>
-                        <td><span class="pull-right">{{ vm.disk_size|floatformat }} GiB </span></td>
+                        <td><span class="pull-right">{{ vm.memory|floatformat }} GB </span></td>
+                        <td><span class="pull-right">{{ vm.disk_size|floatformat }} GB </span></td>
                         <td><span class="pull-right">{{ vm.price|floatformat }} CHF</span></td>
 
                     </tr>
diff --git a/hosting/templates/hosting/includes/_pricing.html b/hosting/templates/hosting/includes/_pricing.html
index c5cb2bf1..8abbf26f 100644
--- a/hosting/templates/hosting/includes/_pricing.html
+++ b/hosting/templates/hosting/includes/_pricing.html
@@ -42,14 +42,14 @@
                   <li>
                     <div class="form-group">
                       <div class="btn-group">
-                        <label for="memory">Memory: {{vm.memory}} GiB</label> 
+                        <label for="memory">Memory: {{vm.memory}} GB</label> 
                       </div>
                     </div>
                   </li>           
                   <li>
                     <div class="form-group row">
                       <div class="col-xs-offset-1 col-xs-9 col-sm-12 col-md-12 col-md-offset-0">
-                        <label for="Disk Size">Disk Size: {{vm.disk_size}} GiB</label>
+                        <label for="Disk Size">Disk Size: {{vm.disk_size}} GB</label>
                       </div>
                     </div>
                   </li>
@@ -79,4 +79,4 @@
     </div>
 
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 7705a006..b691f34d 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -51,9 +51,9 @@
             <div class="content">
                 <p><b>{% trans "Cores"%}</b> <span class="pull-right">{{vm.cores}}</span></p>
                 <hr>
-                <p><b>{% trans "Memory"%}</b> <span class="pull-right">{{vm.memory}} GiB</span></p>
+                <p><b>{% trans "Memory"%}</b> <span class="pull-right">{{vm.memory}} GB</span></p>
                 <hr>
-                <p><b>{% trans "Disk space"%}</b> <span class="pull-right">{{vm.disk_size}} GiB</span></p>
+                <p><b>{% trans "Disk space"%}</b> <span class="pull-right">{{vm.disk_size}} GB</span></p>
                 <hr>
                 <h4>{% trans "Total"%}<p class="pull-right"><b>{{vm.price}} CHF</b></p></h4>
             </div>
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index db45c282..e41f57d7 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -18,10 +18,10 @@
                                     class="pull-right">{{request.session.specs.cpu|floatformat}}</span></p>
 								<hr>
 								<p><b>{%trans "Memory"%}</b> <span
-                                    class="pull-right">{{request.session.specs.memory|floatformat}} GiB</span></p>
+                                    class="pull-right">{{request.session.specs.memory|floatformat}} GB</span></p>
 								<hr>
 								<p><b>{%trans "Disk space"%}</b> <span
-                                    class="pull-right">{{request.session.specs.disk_size|floatformat}} GiB</span></p>
+                                    class="pull-right">{{request.session.specs.disk_size|floatformat}} GB</span></p>
 								<hr>
 								<h4>Total<p
                                     class="pull-right"><b>{{request.session.specs.price }} CHF</b></p></h4>
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index 11f0e4ba..441d6260 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -80,14 +80,14 @@
 								      <div class="col-md-3">
 								        <div class="well text-center box-setting">
 								        	<i class="fa fa-tachometer" aria-hidden="true"></i> {% trans "Memory"%} <br/>
-								        	<span class="label label-success">{{virtual_machine.memory}} GiB</span>
+								        	<span class="label label-success">{{virtual_machine.memory}} GB</span>
 								        </div>
 								      </div>
 								      <div class="col-md-3">
 								        <div class="well text-center box-setting">
 								        	<i class="fa fa-hdd-o" aria-hidden="true"></i> 
 								        	<span>{% trans "Disk"%}</span>
-								        	<span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GiB</span>
+								        	<span class="label label-success">{{virtual_machine.disk_size|floatformat:2}} GB</span>
 								        </div>
 								      </div>
 								    </div><!--/row-->