diff --git a/services/d-phys_computer_usage_policies.markdown b/services/d-phys_computer_usage_policies.markdown
deleted file mode 100644
index 7c24e13076df9b89763395a52bddf2dac0cd4b7b..0000000000000000000000000000000000000000
--- a/services/d-phys_computer_usage_policies.markdown
+++ /dev/null
@@ -1,13 +0,0 @@
-D-PHYS Computer Usage Policies
-==============================
-
-Many computers at the [Department of Physics](http://www.phys.ethz.ch/) are available for more than one purpose and used by more than one person.  The D-PHYS encourages their optimal use by all interested parties connected to the D-PHYS.  Research and Education done by and for the D-PHYS gets preferrential treatment and all use has to fall within the regulations set forth by the [BOT](https://rechtssammlung.sp.ethz.ch/Dokumente/203.21en.pdf) and Swiss law.
-In this document we collect some information about the code of conduct we expect users to follow.  If you haven't used our resources in a while come back here and check for the latest conventions.
-
-##### Numeric Computations on the Linux Workstations (Background Jobs)
-
-Many workstations would have idle CPUs most of the time if used only for their main purpose. Feel free to use this idle time for your research projects but [[respect others|linux/how_to_handle_long_running_jobs/]].
-
-##### Private and/or Personal Web Servers
-
-In general it is not allowed to run a personal web server on the D-PHYS workstations.  If you want to publish some files via the Internet, you can use your D-PHYS account to set up your [[personal webpage|web/how_to_get_a_personal_homepage]]. You will still need to follow the rules set by the [BOT](https://rechtssammlung.sp.ethz.ch/Dokumente/203.21en.pdf).  If you need web pages for a project we recommend you use a proper web server.  Feel free to contact the ISG of the D-PHYS at isg@phys.ethz.ch.
diff --git a/services/usage_policies.markdown b/services/usage_policies.markdown
index b6615d673f506bca336536638068dbdd000759be..aac5f11b7531cd694c0603487fec39a50fb50ef3 100644
--- a/services/usage_policies.markdown
+++ b/services/usage_policies.markdown
@@ -1,9 +1,14 @@
 Usage Policies
 ==============
 
-* General [[D-PHYS Computer Usage Policies]]
-    * Student Workstations: [[linux/How to handle long running jobs]]
-* [Standards für Verantwortlichkeiten und Systempflege](https://rechtssammlung.sp.ethz.ch/Dokumente/203.23.pdf)
-* [Benutzungsordnung für Telematik (BOT)](https://rechtssammlung.sp.ethz.ch/Dokumente/203.21.pdf)
-* [Acceptable Use Policy for Telematics Resources ("BOT")](https://rechtssammlung.sp.ethz.ch/Dokumente/203.21en.pdf)
-* [[Recommendation for the Use and Care of Data on Computers]]
+A number of regulations are put forth by ETH to guide the usage of computers and information security in general.
+
+* [Acceptable Use Policy for Information Technology ("BOT")](https://rechtssammlung.sp.ethz.ch/Dokumente/203.21.pdf)
+* [Directive on Information Security](https://rechtssammlung.sp.ethz.ch/dokumente/203.25.pdf)
+* [IT Guidelines and IT Baseline Protection Rules](https://rechtssammlung.sp.ethz.ch/dokumente/203.23.pdf)
+* [Directive on Inventory and Classification of information](https://rechtssammlung.sp.ethz.ch/Dokumente/203.28.pdf)
+* [Directive on Logging, Evaluation and Monitoring](https://rechtssammlung.sp.ethz.ch/Dokumente/203.29.pdf)
+
+* Further guidelines and code of conducts
+    - [[linux/How to handle long running jobs]]
+    - [[Recommendation for the Use and Care of Data on Computers]]
diff --git a/services/workstations.markdown b/services/workstations.markdown
index 21d2a4ae95543c1c19808d36c115257f494122bc..c0a5c0d4ede389f5cc41f0e3809464a5ab3bfd01 100644
--- a/services/workstations.markdown
+++ b/services/workstations.markdown
@@ -1,16 +1,10 @@
 Workstations
 ============
 
-The ISG operates a large number of workstations running [[Linux|linuxws]], [[macOS|macws]] and [[Windows|windowsws]]. We call them _Managed Workstations_. You need a physics [[account/]] to use them.  Your files are automatically on our fileservers and [[backed up|backups/]] on a regular basis. Please also note the [[usage policy|d-phys_computer_usage_policies]].
+The ISG operates a large number of workstations running [[Linux|linuxws]], [[macOS|macws]] and [[Windows|windowsws]]. We call them _Managed Workstations_. You need a physics [[account/]] to use them.  Your files are automatically on our fileservers and [[backed up|backups/]] on a regular basis. Please note the general [[services/usage policies]].
 
 One public room is equipped with Linux workstations:
 
-* In the room [HIT E 12](https://www.ethz.ch/services/de/service/raeume-standorte-transporte/raeume-gebaeude/orientierung/gebaeude.html?args0=HIT) you'll find some computers running Linux and a wide range of applications like mail clients, word processors, TeX and scientific applications. These computers are free for public use within the [[usage policy|d-phys_computer_usage_policies]] while they're not being used for exercises.
+* In the room [HIT E 12](https://www.ethz.ch/services/de/service/raeume-standorte-transporte/raeume-gebaeude/orientierung/gebaeude.html?args0=HIT) you'll find some computers running Linux and a wide range of applications like mail clients, word processors, TeX and scientific applications.
 
-* A second room [HIT F 21](https://www.ethz.ch/services/de/service/raeume-standorte-transporte/raeume-gebaeude/orientierung/gebaeude.html?args0=HIT) exists, which is managed by ID services.
-
-* You can access a complete Windows Desktop from Linux with RDP: `xfreerdp /f /bpp:24 /d:ad /v:winlogin.phys.ethz.ch /u:$USER +fonts`
-
-You will find those workstations also in several institutes like [ITP](http://www.itp.phys.ethz.ch/), [IPA](http://www.ipa.phys.ethz.ch/) and [Nano](http://www.nano.phys.ethz.ch/). As well as at [FIRST](http://www.first.ethz.ch/), and [IGP](http://www.igp.ethz.ch/).
-
-More rooms could be found with the [room information database](https://ethz.ch/staffnet/en/service/rooms-and-buildings/roominfo.html).
+* A second room [HIT F 21](https://www.ethz.ch/services/de/service/raeume-standorte-transporte/raeume-gebaeude/orientierung/gebaeude.html?args0=HIT) exists, which is managed by ID services. More rooms could be found with the [room information database](https://ethz.ch/staffnet/en/service/rooms-and-buildings/roominfo.html).